minimapper 0.2.2 → 0.2.3

data/lib/minimapper/entity/attributes.rb

@@ -4,28 +4,46 @@ module Minimapper
   module Entity
     module Attributes
       def attributes(*list)
-        list.each do |attribute|
-          type = nil
+        columns = add_columns(list)
+        columns.each do |column|
+          define_reader(column)
+          define_writer(column)
+        end
+      end
 
-          if attribute.is_a?(Array)
-            attribute, type = attribute
-          end
+      def column_names
+        @entity_columns.map(&:name).map(&:to_s)
+      end
 
-          define_method(attribute) do
-            attributes[attribute]
-          end
+      private
 
-          define_method("#{attribute}=") do |value|
-            attributes[attribute] = Convert.new(value).to(type)
-          end
+      def add_columns(list)
+        @entity_columns ||= []
+        @entity_columns |= list.map { |data| Column.new(data) }
+      end
+
+      def define_reader(column)
+        define_method(column.name) do
+          attributes[column.name]
         end
+      end
 
-        @@column_names ||= []
-        @@column_names |= list
+      def define_writer(column)
+        define_method("#{column.name}=") do |value|
+          attributes[column.name] = Convert.new(value).to(column.type)
+        end
       end
 
-      def column_names
-        @@column_names.map { |column| column.is_a?(Array) ? column.first : column }.map(&:to_s)
+      class Column
+        attr_reader :name, :type
+
+        def initialize(data)
+          if data.is_a?(Array)
+            @name, @type = data
+          else
+            @name = data
+          end
+        end
       end
     end
   end

data/lib/minimapper/version.rb

@@ -1,3 +1,3 @@
 module Minimapper
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/unit/entity_spec.rb

@@ -9,6 +9,11 @@ class TestUser
   attributes :name
 end
 
+class TestProject
+  include Minimapper::Entity
+  attributes :title
+end
+
 describe Minimapper::Entity do
   it "handles base attributes" do
     entity = TestEntity.new
@@ -82,4 +87,8 @@ describe Minimapper::Entity, "self.column_names" do
     # used by some rails plugins
     TestUser.column_names.should == [ "id", "created_at", "updated_at", "name" ]
   end
+
+  it "does not leak between different models" do
+    TestProject.column_names.should == [ "id", "created_at", "updated_at", "title" ]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimapper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70350098645360 !ruby/object:Gem::Requirement
+  requirement: &70245281835840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350098645360
+  version_requirements: *70245281835840
 description: A minimalistic way of separating your models from ORMs like ActiveRecord.
 email:
 - joakim.kolsjo@gmail.com
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4282956153133681718
+      hash: -1233947130064928400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4282956153133681718
+      hash: -1233947130064928400
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5