disposable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3028d579eaa9e41a6d3591c069809c98940bd7a1
-  data.tar.gz: 12371d78cdf1c2bfe046021f45ffb0a1dbd4ccff
+  metadata.gz: 9f223895880d3cf7e132a9fc7fe289d2364cda94
+  data.tar.gz: f6fb9b0b50ab1f76f6a76c233bc6a7b764d715c0
 SHA512:
-  metadata.gz: 2af96f209c219622ac48b55d86798cd392fd83cb73e14463319d965c20a01824e4354ff5f09e9b71bddc21caeb64e369cb265478c77572226c1245297a7f25bc
-  data.tar.gz: e58b5545c50a104ca16ae784cb48a2280dc60a407f35345dcccf78e867756380993826be1e6d4ce5f442475f0fd1311fddc4f2079f467cf5d1b774ce05b44c07
+  metadata.gz: b419406d81071ac149d0bb88a4b4165763b752be5530125ddb4a2165b05ffb704087cc5502d37bde78ef75b132bf49b101d9b7ec475ef3754904619f5039cae9
+  data.tar.gz: 8f18dd625473e5880a7a600698bb36eef37cf1791df67ed59e91c9f0179e168d16a32e201002afa8d3bbb85f75d426b88fb5c28f7958d19404d8a8b1878112a9

data/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.0.4
+
+* Added `Composition#[]` to access contained models in favor of reader methods to models. The latter got removed. This allows mapping methods with the same name than the contained object.

data/README.md

@@ -3,7 +3,7 @@
 
 why?
 because i want this to fuckin work: Wallpaper.find(51).update_attributes(enabled:false)
-
+i want to see my fields when opening the class file, a la DataMapper.
 
 ## Twin
 

data/lib/disposable/composition.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 
 module Disposable
   # Composition delegates accessors to models as per configuration.
+  #
   # Composition doesn't know anything but methods (readers and writers) to expose and the mappings to
   # the internal models. Optionally, it knows about renamings such as mapping `#song_id` to `song.id`.
   #
@@ -14,6 +15,8 @@ module Disposable
   #   album = Album.new(cd: CD.find(1), band: Band.new)
   #   album.id #=> 1
   #   album.title = "Ten Foot Pole"
+  #
+  # It allows accessing the contained models using the `#[]` reader.
   module Composition
     def self.included(base)
       base.extend(Forwardable)
@@ -26,8 +29,6 @@ module Disposable
          @map = {}
 
         options.each do |mdl, meths|
-          attr_reader mdl
-
           meths.each do |mtd| # [[:title], [:id, :song_id]]
             create_accessors(mdl, mtd)
             add_to_map(mdl, mtd)
@@ -37,8 +38,8 @@ module Disposable
 
     private
       def create_accessors(model, methods)
-        def_instance_delegator model, *methods # reader
-        def_instance_delegator model, *methods.map { |m| "#{m}=" } # writer
+        def_instance_delegator "@#{model}", *methods # reader
+        def_instance_delegator "@#{model}", *methods.map { |m| "#{m}=" } # writer
       end
 
       def add_to_map(model, methods)
@@ -58,12 +59,17 @@ module Disposable
       @_models = models.values
     end
 
+    # Allows accessing the contained models.
+    def [](name)
+      instance_variable_get(:"@#{name}")
+    end
+
     # Allows multiplexing method calls to all composed models.
     def each(&block)
       _models.each(&block)
     end
 
   private
-    attr_reader:_models
+    attr_reader :_models
   end
 end

data/lib/disposable/twin.rb

@@ -32,14 +32,18 @@ module Disposable
     end
 
     def self.property(name, options={}, &block)
-      options[:public_name]  = options.delete(:as) || name
+      options[:private_name]  = options.delete(:as) || name
       options[:pass_options] = true
 
       representer_class.property(name, options, &block).tap do |definition|
-        attr_accessor definition[:public_name]
+        attr_accessor name
       end
     end
 
+    def self.collection(name, options={}, &block)
+      property(name, options.merge(:collection => true), &block)
+    end
+
     def self.from(model) # TODO: private.
       new(model)
     end
@@ -64,7 +68,7 @@ module Disposable
           :serialize     => lambda { |obj, args| obj.send(:model) }) }
 
         save.representable_attrs.each do |attr|
-          attr.merge!(:as => attr.name)
+          attr.merge!(:as => attr[:private_name])
         end
 
       save
@@ -78,11 +82,13 @@ module Disposable
       representer.representable_attrs.
         find_all { |attr| attr[:twin] }.
         each { |attr| attr.merge!(
-          :prepare      => lambda { |object, args| args.binding[:twin].new(object) }) }
+          :prepare      => lambda { |object, args| args.binding[:twin].call.new(object) }) }
 
       # song_title => model.title
       representer.representable_attrs.each do |attr|
-        attr.merge!(:as => attr[:public_name])
+        attr.merge!(
+          :getter      => lambda { |args| send("#{args.binding[:private_name]}") },
+        )
       end
 
       representer
@@ -91,16 +97,6 @@ module Disposable
     # read/write to twin using twin's API (e.g. #record= not #album=).
     def self.write_representer
       representer = Class.new(representer_class) # inherit configuration
-      representer.representable_attrs.
-        each { |attr| attr.merge!(
-          # use the alias name (as:) when writing attributes in new.
-          # DISCUSS: attr.name = public_name would be simpler.
-          :as => attr[:public_name],
-          :getter      => lambda { |args|        send("#{args.binding[:public_name]}") },
-          :setter      => lambda { |value, args| send("#{args.binding[:public_name]}=", value) }
-        )}
-
-      representer
     end
 
     # call save on all nested twins.

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/composition_test.rb

@@ -3,27 +3,28 @@ require 'test_helper'
 class CompositionTest < MiniTest::Spec
   module Model
     Band  = Struct.new(:id, :title,)
-    Album = Struct.new(:id, :name)
+    Album = Struct.new(:id, :name, :album)
   end
 
   module Twin
     class Album #< Disposable::Twin
       include Disposable::Composition
 
-      map( {:album => [[:id], [:name]],
+      map( {:album => [[:id], [:name], [:album]],
             :band  => [[:id, :band_id], [:title]]
           } )
     end
   end
 
   let (:band) { Model::Band.new(1, "Frenzal Rhomb") }
-  let (:album) { Model::Album.new(2, "Dick Sandwhich") }
+  let (:album) { Model::Album.new(2, "Dick Sandwich", "For the Term of Their Unnatural Lives") }
   subject { Twin::Album.new(:album => album, :band => band) }
 
   describe "readers" do
     it { subject.id.must_equal 2 }
     it { subject.band_id.must_equal 1 }
-    it { subject.name.must_equal "Dick Sandwhich" }
+    it { subject.name.must_equal "Dick Sandwich" }
+    it { subject.album.must_equal "For the Term of Their Unnatural Lives" }
     it { subject.title.must_equal "Frenzal Rhomb" }
   end
 
@@ -34,6 +35,7 @@ class CompositionTest < MiniTest::Spec
       subject.band_id = 4
       subject.name = "Eclipse"
       subject.title = "Yngwie J. Malmsteen"
+      subject.album = "Best Of"
     end
 
     it { subject.id.must_equal 3 }
@@ -44,6 +46,8 @@ class CompositionTest < MiniTest::Spec
     it { subject.title.must_equal "Yngwie J. Malmsteen" }
     it { album.name.must_equal "Eclipse" }
     it { band.title.must_equal "Yngwie J. Malmsteen" }
+    it { subject.album.must_equal "Best Of" }
+    it { album.album.must_equal "Best Of" }
   end
   # it { subject.save }
 
@@ -54,9 +58,11 @@ class CompositionTest < MiniTest::Spec
   end
 
 
-  describe "readers to models" do
-    it { subject.album.object_id.must_equal album.object_id }
-    it { subject.band.object_id.must_equal  band.object_id }
+  describe "#[]" do
+    it { subject[:album].object_id.must_equal album.object_id }
+    it { subject[:band].object_id.must_equal  band.object_id }
+
+    it { assert_raises( NoMethodError) { subject.song } } # no reader to contained model.
   end
 
 

data/test/twin/active_record_test.rb

@@ -109,15 +109,15 @@ class TwinActiveRecordAsTest < MiniTest::Spec
   module Twin
     class Album < Disposable::Twin
       property :id
-      property :name, :as => :album_name
+      property :album_name, :as => :name
 
       model ::Album
     end
 
     class Song < Disposable::Twin
       property :id
-      property :title, :as => :song_title
-      property :album, :twin => Album, :as => :record
+      property :song_title, :as => :title
+      property :record, :twin => Album, :as => :album
 
       model ::Song
     end

data/test/twin/twin_test.rb

@@ -4,14 +4,18 @@ require 'test_helper'
 class TwinTest < MiniTest::Spec
   module Model
     Song  = Struct.new(:id, :title, :album)
-    Album = Struct.new(:id, :name)
+    Album = Struct.new(:id, :name, :songs)
   end
 
 
   module Twin
+    class Song < Disposable::Twin
+    end
+
     class Album < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :name
+      collection :songs, :twin => Song
 
       model Model::Album
     end
@@ -27,20 +31,25 @@ class TwinTest < MiniTest::Spec
 
 
   describe "::new" do # TODO: this creates a new model!
-    subject { Twin::Song.new }
+    let(:album) { Twin::Album.new }
+    let (:song) { Twin::Song.new }
 
-    it { subject.title.must_equal nil }
-    it { subject.album.must_equal nil }
+    it { album.name.must_equal nil }
+    it { album.songs.must_equal nil }
+    it { song.title.must_equal nil }
+    it { song.album.must_equal nil }
   end
 
 
   describe "::new with arguments" do
-    let (:album) { Twin::Album.new(:name => "30 Years") }
+    let (:talking) { Twin::Song.new("title" => "Talking") }
+    let (:album) { Twin::Album.new(:name => "30 Years", :songs => [talking]) }
     subject { Twin::Song.new("title" => "Broken", "album" => album) }
 
     it { subject.title.must_equal "Broken" }
     it { subject.album.must_equal album }
     it { subject.album.name.must_equal "30 Years" }
+    it { album.songs.must_equal [talking] }
   end
 
 
@@ -55,13 +64,14 @@ class TwinTest < MiniTest::Spec
   # DISCUSS: make ::from private.
   describe "::from" do
     let (:song) { Model::Song.new(1, "Broken", album) }
-    let (:album) { Model::Album.new(2, "The Process Of  Belief") }
+    let (:album) { Model::Album.new(2, "The Process Of  Belief", [Model::Song.new(3, "Dr. Stein")]) }
 
     subject {Twin::Song.from(song) }
 
     it { subject.title.must_equal "Broken" }
     it { subject.album.must_be_kind_of Twin::Album }
     it { subject.album.name.must_equal album.name }
+    it { subject.album.songs.first.title.must_equal "Dr. Stein" } # TODO: more tests on collections and object identity (if we need that).
   end
 end
 
@@ -88,14 +98,14 @@ class TwinAsTest < MiniTest::Spec
 
   module Twin
     class Album < Disposable::Twin
-      property :name, :as => :record_name
+      property :record_name, :as => :name
 
       model Model::Album
     end
 
     class Song < Disposable::Twin
-      property :title, :as => :name
-      property :album, :twin => Album, :as => :record
+      property :name, :as => :title
+      property :record, :twin => Album, :as => :album
 
       model Model::Song
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md