minimapper 0.1.1 → 0.1.2

data/README.md

@@ -63,6 +63,7 @@ require "minimapper/memory"
 
 class User
   include Minimapper::Entity
+
   attributes :name, :email
   validates :name, :presence => true
 end
@@ -190,6 +191,10 @@ User.new(:profile_id => " ").profile_id       # => nil
 User.new(:profile_id => "foobar").profile_id  # => nil
 ```
 
+### Custom entity class
+
+You don't need to use Minimapper::Entity. The core API is implemented in [Minimapper::Entity::Core](https://github.com/joakimk/minimapper/blob/master/lib/minimapper/entity/core.rb). Either include that module or implement your own version.
+
 ### Adding a new mapper
 
 If you where to add a [Mongoid](http://mongoid.org/en/mongoid/index.html) mapper:
@@ -241,7 +246,6 @@ You need mysql and postgres installed (but they do not have to be running) to be
 
 ### Next
 
-* Make "informal" optional. If you only use minimapper/entity/core there is no need for it as a dependency.
 * Add some way to extend type conversions to keep that part of minimapper small.
 * Extract entity and model class lookup code from the ar-mapper and reuse it in the memory mapper.
 * Change the memory mapper to store entity attributes, not entity instances.

data/lib/minimapper/entity/attributes.rb

@@ -12,13 +12,11 @@ module Minimapper
           end
 
           define_method(attribute) do
-            instance_variable_get("@#{attribute}")
+            attributes[attribute]
           end
 
           define_method("#{attribute}=") do |value|
-            value = Convert.new(value).to(type)
-            instance_variable_set("@#{attribute}", value)
-            attributes[attribute] = value
+            attributes[attribute] = Convert.new(value).to(type)
           end
         end
       end

data/lib/minimapper/entity/core.rb

@@ -11,12 +11,18 @@ module Minimapper
       end
 
       def attributes=(new_attributes)
-        @attributes = attributes.merge(new_attributes)
+        @attributes = attributes.merge(symbolize_keys(new_attributes))
       end
 
       def valid?
         true
       end
+
+      private
+
+      def symbolize_keys(hash)
+        hash.inject({}) { |h, (k, v)| h.merge!(k.to_sym => v) }
+      end
     end
   end
 end

data/lib/minimapper/entity/rails.rb

@@ -1,6 +1,15 @@
+require "active_model"
+
 module Minimapper
   module Entity
     module Rails
+      def self.included(klass)
+        klass.class_eval do
+          extend  ActiveModel::Naming
+          include ActiveModel::Validations
+        end
+      end
+
       def to_param
         id
       end
@@ -8,6 +17,18 @@ module Minimapper
       def persisted?
         id
       end
+
+      def new_record?
+        !id
+      end
+
+      def to_model
+        self
+      end
+
+      def to_key
+        persisted? ? [ id ] : nil
+      end
     end
   end
 end

data/lib/minimapper/entity.rb

@@ -1,5 +1,4 @@
 # Look at minimapper/entity/core for the required API.
-require 'informal'
 require 'minimapper/entity/core'
 require 'minimapper/entity/attributes'
 require 'minimapper/entity/rails'
@@ -8,8 +7,16 @@ module Minimapper
   module Entity
     include Minimapper::Entity::Core
 
+    def initialize(attributes = {})
+      self.attributes = attributes
+    end
+
+    def attributes=(new_attributes)
+      super(new_attributes)
+      new_attributes.each_pair { |name, value| self.send("#{name}=", value) }
+    end
+
     def self.included(klass)
-      klass.send(:include, Informal::Model)
       klass.send(:include, Minimapper::Entity::Rails)
       klass.send(:extend, Minimapper::Entity::Attributes)
       klass.attributes([ :id, :Integer ], [ :created_at, :DateTime ], [ :updated_at, :DateTime ])

data/lib/minimapper/version.rb

@@ -1,3 +1,3 @@
 module Minimapper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/minimapper.gemspec

@@ -17,6 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "informal"
-  gem.add_dependency "rake"
+  gem.add_development_dependency "rake"
 end

data/unit/entity/core_spec.rb

@@ -2,6 +2,7 @@ require 'minimapper/entity/core'
 
 class BasicEntity
   include Minimapper::Entity::Core
+  attr_accessor :one, :two
 end
 
 describe Minimapper::Entity::Core do
@@ -19,6 +20,13 @@ describe Minimapper::Entity::Core do
     entity.attributes.should == { :one => 1, :two => 2 }
   end
 
+  it "converts all keys to symbols" do
+    entity = BasicEntity.new
+    entity.attributes = { :one => 1 }
+    entity.attributes = { "one" => 11 }
+    entity.attributes.should == { :one => 11 }
+  end
+
   it "returns true for valid?" do
     entity = BasicEntity.new
     entity.should be_valid

data/unit/entity/rails_spec.rb

@@ -0,0 +1,53 @@
+require 'minimapper/entity/rails'
+require 'minimapper/entity/core'
+
+class RailsEntity
+  include Minimapper::Entity::Core
+  include Minimapper::Entity::Rails
+
+  attr_accessor :name
+  validates :name, :presence => true
+end
+
+describe Minimapper::Entity::Rails do
+  it "responds to new_record?" do
+    entity = RailsEntity.new
+    entity.should be_new_record
+    entity.id = 5
+    entity.should_not be_new_record
+  end
+
+  it "resonds to to_model" do
+    entity = RailsEntity.new
+    entity.to_model.should == entity
+  end
+
+  it "responds to to_key" do
+    entity = RailsEntity.new
+    entity.to_key.should be_nil
+    entity.id = 5
+    entity.to_key.should == [ 5 ]
+  end
+
+  # for rails link helpers
+  it "responds to to_param" do
+    entity = RailsEntity.new
+    entity.id = 5
+    entity.to_param.should == 5
+  end
+
+  # for rails form helpers
+  it "responds to persisted?" do
+    entity = RailsEntity.new
+    entity.should_not be_persisted
+    entity.id = 5
+    entity.should be_persisted
+  end
+
+  it "includes active model validations" do
+    entity = RailsEntity.new
+    entity.should_not be_valid
+    entity.name = "Joe"
+    entity.should be_valid
+  end
+end

data/unit/entity_spec.rb

@@ -7,7 +7,6 @@ end
 class TestUser
   include Minimapper::Entity
   attributes :name
-  validates :name, :presence => true
 end
 
 describe Minimapper::Entity do
@@ -25,21 +24,31 @@ describe Minimapper::Entity do
   end
 
   it "can access attributes set at construction time" do
-    entity = TestEntity.new(:id => 5)
+    entity = TestUser.new(:id => 5)
+    entity.id.should == 5
+    entity.attributes[:id].should == 5
+  end
+
+  it "can access attributes set though a hash" do
+    entity = TestUser.new
+    entity.attributes = { :id => 5 }
     entity.id.should == 5
+    entity.attributes = { "id" => 8 }
+    entity.id.should == 8
   end
 
   it "converts typed attributes" do
     entity = TestEntity.new
     entity.id = "10"
     entity.id.should == 10
+    entity.attributes = { :id => "15" }
+    entity.id.should == 15
   end
 
-  it "applies validations" do
-    user = TestUser.new
-    user.should_not be_valid
-    user.name = "Joe"
-    user.should be_valid
+  it "symbolizes keys" do
+    entity = TestEntity.new
+    entity.attributes = { "id" => "15" }
+    entity.attributes[:id].should == 15
   end
 end
 
@@ -61,19 +70,3 @@ describe Minimapper::Entity, "attributes" do
     entity.attributes.should == { :id => 5, :created_at => time }
   end
 end
-
-describe Minimapper::Entity, "to_param" do
-  it "responds with the id to be compatible with rails link helpers" do
-    entity = TestEntity.new(:id => 5)
-    entity.to_param.should == 5
-  end
-end
-
-describe Minimapper::Entity, "persisted?" do
-  it "responds true when there is an id (to be compatible with rails form helpers)" do
-    entity = TestEntity.new
-    entity.should_not be_persisted
-    entity.id = 5
-    entity.should be_persisted
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimapper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,28 +11,17 @@ bindir: bin
 cert_chain: []
 date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: informal
-  requirement: &70315666068220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70315666068220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70315666067440 !ruby/object:Gem::Requirement
+  requirement: &70233951931080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70315666067440
+  version_requirements: *70233951931080
 description: A minimalistic way of separating your models from ORMs like ActiveRecord
   (by implementing the repository pattern)
 email:
@@ -68,6 +57,7 @@ files:
 - spec/support/shared_examples/mapper.rb
 - unit/entity/convert_spec.rb
 - unit/entity/core_spec.rb
+- unit/entity/rails_spec.rb
 - unit/entity_spec.rb
 - unit/memory_spec.rb
 - unit/repository_spec.rb