entasis 0.2.2 → 0.3.0.pre1

data/HISTORY

@@ -1,3 +1,7 @@
+== 0.3.0
+Refactored to dependency injection
+Only set known attributes
+
 == 0.2.1
 Introduced ActiveModel validations
 
@@ -6,4 +10,4 @@ Moved away from Struct and started to use attr_accessor as boiler plate.
 Added Base.attributes method to define attributes
 
 == 0.1.0
-Initial release
+Initial release

data/README.md

@@ -5,39 +5,22 @@ Entasis provides a few neat methods for building a basic class. Handy for models
 
 Example:
 
-    class Person < Entasis::Base
-      attributes :name, :age, :city
+```ruby
+class Person
+  include Entasis::Model
 
-      def age=(years)
-        @age = years.to_i
-      end
-    end
+  attributes :name, :age, :city
 
-    hilda = Person.new(:name => 'Hilda', :age => '23', :city => 'Berlin')
-    hilda.attribute_names # => ["name", "age", "city"]
-    hilda.attributes      # => {"name"=>"Hilda", "age"=>23, "city"=>"Berlin"}
-    anon = Person.new
-    anon.valid?           # => false
-    anon.errors           # => {:name=>["can't be blank"]}>
+  def age=(years)
+    @age = years.to_i
+  end
+end
 
+hilda = Person.new(:name => 'Hilda', :age => '23', :city => 'Berlin')
+hilda.attribute_names # => ["name", "age", "city"]
+hilda.attributes      # => {"name"=>"Hilda", "age"=>23, "city"=>"Berlin"}
 
-Note on Patches/Pull Requests
------------------------------
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-* Send me a pull request.
-
-
-Author
-------
-
-Ingemar Edsborn (ingemar@xox.se)
-
-
-Copyright
----------
-
-Copyright (c) 2010 Ingemar Edsborn. See LICENSE for details
+anon = Person.new
+anon.valid?           # => false
+anon.errors           # => {:name=>["can't be blank"]}>
+```

data/lib/entasis/base.rb

@@ -1,36 +1,5 @@
 module Entasis
   class Base
-    include ActiveModel::Validations
-
-    class << self
-      # Takes a list of symbolized attribute names and defines them
-      def attributes(*attrs)
-        @@attribute_names = attrs.map(&:to_s)
-        attr_accessor(*attrs)
-      end
-    end
-
-    # Takes a hash and assigns keys and values to it's attributes members
-    def initialize(*args)
-      if args.first.is_a?(Hash) then set_attributes_from_hash(args.first) else super(*args) end
-    end
-
-    def attribute_names
-      @@attribute_names
-    end
-
-    # Returns an attributes hash
-    def attributes
-      attrs = {}
-      attribute_names.each { |name| attrs[name] = send(name) }
-      attrs
-    end
-
-    private
-    # Takes each key and value from the hash and assigns it to it's attribute.
-    def set_attributes_from_hash(hash)
-      hash.each_pair { |key, value| self.send("#{key}=", value) }
-    end
+    include Entasis::Model
   end
 end
-

data/lib/entasis/model.rb

@@ -0,0 +1,46 @@
+module Entasis
+  module Model
+    extend ActiveSupport::Concern
+
+    included do
+      include ActiveModel::Validations
+
+      self.class_eval 'class UnknownAttributeError < StandardError; end'
+    end
+
+    module ClassMethods
+      # Takes a list of symbolized attribute names and defines them
+      def attributes(*attrs)
+        class_variable_set :@@attribute_names, attrs.map(&:to_s)
+
+        attr_accessor *attrs
+      end
+    end
+
+    # Takes a hash and assigns keys and values to it's attributes members
+    def initialize(hash)
+      self.attributes = hash
+    end
+
+    def attribute_names
+      self.class.class_variable_get :@@attribute_names
+    end
+
+    def attributes=(hash)
+      hash.each do |name, value|
+        if attribute_names.include?(name.to_s) || self.respond_to?(name)
+          self.send("#{name}=", value)
+        else
+          raise self.class::UnknownAttributeError, "unkown attribute \"#{name}\""
+        end
+      end
+    end
+
+    # Returns an attributes hash
+    def attributes
+      attrs = {}
+      attribute_names.each { |name| attrs[name] = send(name) }
+      attrs
+    end
+  end
+end

data/lib/entasis/version.rb

@@ -1,3 +1,3 @@
 module Entasis
-  VERSION = "0.2.2"
+  VERSION = "0.3.0.pre1"
 end

data/lib/entasis.rb

@@ -1,5 +1,7 @@
+require 'active_support'
 require 'active_model'
 
 module Entasis
+  autoload :Model, 'entasis/model'
   autoload :Base, 'entasis/base'
 end

data/spec/entasis_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/person')
 
-describe "Entasis::Base" do
+describe "Entasis::Model" do
   let(:hilda) { hilda = Person.new(:name => 'Hilda', :age => '23', :city => 'Berlin') }
 
   describe "#new" do
@@ -10,6 +10,12 @@ describe "Entasis::Base" do
       hilda.age.should  == 23
       hilda.city.should == 'Berlin'
     end
+
+    it "raises an error if attribute is unknown" do
+      expect {
+        Person.new(undefined: 'value')
+      }.to raise_error Person::UnknownAttributeError, 'unkown attribute "undefined"'
+    end
   end
 
   describe "#attribute_names" do

data/spec/person.rb

@@ -1,4 +1,6 @@
-class Person < Entasis::Base
+class Person
+  include Entasis::Model
+
   attributes :name, :age, :city
 
   validates_presence_of :name

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: entasis
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Ingemar Edsborn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/entasis/base.rb
+- lib/entasis/model.rb
 - lib/entasis/version.rb
 - lib/entasis.rb
 - Gemfile
@@ -77,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23