disposable 0.0.6 → 0.0.7

data/lib/disposable/version.rb

@@ -1,3 +1,3 @@
 module Disposable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/test_helper.rb

@@ -10,6 +10,6 @@ class Track
 end
 
 
-require 'active_record'
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
+# require 'active_record'
+# require 'database_cleaner'
+# DatabaseCleaner.strategy = :truncation

data/test/twin/composition_test.rb

@@ -1,37 +1,45 @@
-# require 'test_helper'
+require 'test_helper'
 
-# class TwinCompositionTest < MiniTest::Spec
-#   class Request < Disposable::Twin::Composition
-#     property :title, :on => :song, :as => :song_title
-#     property :id,    :on => :song, :as => :song_id
+require 'disposable/twin/composition'
 
-#     property :name,  :on => :requester
+class TwinCompositionTest < MiniTest::Spec
+  class Request < Disposable::Twin::Composition
+    property :song_title, :on => :song, :as => :title
+    property :song_id,    :on => :song, :as => :id
 
-#     # map ...
-#   end
+    property :name,       :on => :requester
+    property :id,         :on => :requester
 
-#   module Model
-#     Song      = Struct.new(:id, :title, :album)
-#     Requester = Struct.new(:id, :name)
-#   end
+    # map ...
 
-#   let (:requester) { Model::Requester.new(1, "Greg Howe") }
-#   let (:song) { Model::Song.new(2, "Extraction") }
+    # def id
+    # make map(name, options)
+    # option :played?
+  end
 
-#   let (:request) { Request.new([:song => song, :requester => requester]) }
+  module Model
+    Song      = Struct.new(:id, :title, :album)
+    Requester = Struct.new(:id, :name)
+  end
 
-#   it { request.song_title.must_equal "Extraction" }
-#   it { request.name.must_equal "Greg Howe" }
+  let (:requester) { Model::Requester.new(1, "Greg Howe") }
+  let (:song) { Model::Song.new(2, "Extraction") }
 
+  let (:request) { Request.new(:song => song, :requester => requester) }
 
-#   describe "setter" do
-#     before do
-#       request.song_title = "Tease"
-#       request.name = "Wooten"
-#     end
+  it { request.song_title.must_equal "Extraction" }
+  it { request.name.must_equal "Greg Howe" }
 
-#     it { request.song_title.must_equal "Tease" }
-#     it { song.title.must_equal "Tease" }
-#     it { request.name.must_equal "Wooten" }
-#   end
-# end
+
+  describe "setter" do
+    before do
+      request.song_title = "Tease"
+      request.name = "Wooten"
+    end
+
+    it { request.song_title.must_equal "Tease" }
+    # no writing to model.
+    it { song.title.must_equal "Extraction" }
+    it { request.name.must_equal "Wooten" }
+  end
+end

data/test/twin/twin_test.rb

@@ -9,69 +9,59 @@ class TwinTest < MiniTest::Spec
 
 
   module Twin
-    class Song < Disposable::Twin
-    end
-
     class Album < Disposable::Twin
       property :id # DISCUSS: needed for #save.
       property :name
       collection :songs, :twin => lambda { |*| Song }
 
-      model Model::Album
+      # model Model::Album
     end
 
     class Song < Disposable::Twin
       property :id # DISCUSS: needed for #save.
-      property :title
+      property :name, :as => :title
       property :album, :twin => Album
 
-      model Model::Song
+      # model Model::Song
     end
   end
 
+  let (:song) { Model::Song.new(1, "Broken", nil) }
 
-  describe "::new" do # TODO: this creates a new model!
-    let(:album) { Twin::Album.new }
-    let (:song) { Twin::Song.new }
-
-    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 (: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
-
+  describe "#initialize" do
+    it do
+      twin = Twin::Song.new(song)
+      song.id = 2
+      # :as maps public name
+      twin.name.must_equal "Broken" # public: #name
+      twin.id.must_equal 2
+    end
 
-  describe "::new with :symbols" do
-    subject { Twin::Song.new(:title => "Broken") }
+    # override property with public name in constructor.
+    it do
+      # override twin's value...
+      Twin::Song.new(song, :name => "Kenny").name.must_equal "Kenny"
 
-    it { subject.title.must_equal "Broken" }
-    it { subject.album.must_equal nil }
+      # .. but do not write to the model!
+      song.title.must_equal "Broken"
+    end
   end
 
+  describe "setter" do
+    let (:twin) { Twin::Song.new(song) }
 
-  # 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", [Model::Song.new(3, "Dr. Stein")]) }
+    before do
+      twin.id = 3
+      twin.name = "Lucky"
+    end
 
-    subject {Twin::Song.from(song) }
+    # updates twin
+    it { twin.id.must_equal 3 }
+    it { twin.name.must_equal "Lucky" }
 
-    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).
+    # DOES NOT update model
+    it { song.id.must_equal 1 }
+    it { song.title.must_equal "Broken" }
   end
 end
 
@@ -86,7 +76,7 @@ class OverridingAccessorsTest < TwinTest
     end
   end
 
-  it { Song.from(Model::Song.new(1, "A Tale That Wasn't Right")).title.must_equal "a tale that wasn't right" }
+  it { Song.new(Model::Song.new(1, "A Tale That Wasn't Right")).title.must_equal "a tale that wasn't right" }
 end
 
 
@@ -96,11 +86,28 @@ class TwinDecoratorTest < MiniTest::Spec
   it { subject.twin_names.must_equal [:album] }
 end
 
-# from is as close to from_hash as possible
-# there should be #to in a perfect API, nothing else.
 
+require 'disposable/twin/struct'
+class TwinStructTest < MiniTest::Spec
+  class Song < Disposable::Twin
+    include Struct
+    property :number, :default => 1 # FIXME: this should be :default_if_nil so it becomes clear with a model.
+    option   :cool?
+  end
+
+  # empty hash
+  it { Song.new({}).number.must_equal 1 }
+  # model hash
+  it { Song.new(number: 2).number.must_equal 2 }
+
+  # with hash and options as one hash.
+  it { Song.new(number: 3, cool?: true).cool?.must_equal true }
+  it { Song.new(number: 3, cool?: true).number.must_equal 3 }
 
-# should #new create empty associated models?
+  # with model hash and options hash separated.
+  it { Song.new({number: 3}, {cool?: true}).cool?.must_equal true }
+  it { Song.new({number: 3}, {cool?: true}).number.must_equal 3 }
+end
 
 
 class TwinAsTest < MiniTest::Spec
@@ -114,52 +121,22 @@ class TwinAsTest < MiniTest::Spec
     class Album < Disposable::Twin
       property :record_name, :as => :name
 
-      model Model::Album
+      # model Model::Album
     end
 
     class Song < Disposable::Twin
       property :name, :as => :title
       property :record, :twin => Album, :as => :album
 
-      model Model::Song
+      # model Model::Song
     end
   end
 
-
-  let (:record) { Twin::Album.new(:record_name => "Veni Vidi Vicous") }
-  subject { Twin::Song.new(:name => "Outsmarted", :record => record) }
-
-
-  describe "::new" do # TODO: this creates a new model!
-    # the Twin exposes the as: API.
-    it { subject.name.must_equal "Outsmarted" }
-    it { subject.record.must_equal record }
-  end
-
-  # DISCUSS: should we test saving without AR? is that worth the hustle?
-  # describe "#save" do
-  #   before { subject.send(:model).instance_eval do
-  #     def update_attributes(*)
-
-  #     end
-  #   end
-  #   subject.save
-  # }
-
-
-
-  #   # before { subject.save }
-
-  #   it { subject.name }
-  # end
 end
 
 
-require 'disposable/twin/option'
 class TwinOptionTest < TwinTest
   class Song < Disposable::Twin
-    include Option
-
     property :id # DISCUSS: needed for #save.
     property :title
 
@@ -167,17 +144,21 @@ class TwinOptionTest < TwinTest
     option :highlight?
   end
 
+  let (:song) { Model::Song.new(1, "Broken") }
+  let (:twin) { Song.new(song, :preview? => false) }
 
-  describe "::from" do
-    let (:song) { Model::Song.new(1, "Broken") }
-    let (:twin) { Song.from(song, :preview? => false) }
 
-    it { twin.id.must_equal 1 }
-    it { twin.title.must_equal "Broken" }
-    it { twin.preview?.must_equal false }
+  # properties are read from model.
+  it { twin.id.must_equal 1 }
+  it { twin.title.must_equal "Broken" }
 
-    it { Song.from(song, :preview? => true, :highlight => false).preview?.must_equal true }
-  end
+  # option is not delegated to model.
+  it { twin.preview?.must_equal false }
+  # not passing option means zero.
+  it { twin.highlight?.must_equal nil }
+
+  # passing both options.
+  it { Song.new(song, preview?: true, highlight?: false).preview?.must_equal true }
 end
 
 # TODO: test coercion!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disposable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,58 +70,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.1
 description: Domain-Oriented Refactoring Framework.
 email:
 - apotonick@gmail.com
@@ -152,12 +110,17 @@ files:
 - lib/disposable.rb
 - lib/disposable/composition.rb
 - lib/disposable/twin.rb
+- lib/disposable/twin/composition.rb
 - lib/disposable/twin/finders.rb
+- lib/disposable/twin/new.rb
 - lib/disposable/twin/option.rb
+- lib/disposable/twin/representer.rb
+- lib/disposable/twin/save.rb
+- lib/disposable/twin/save_.rb
+- lib/disposable/twin/struct.rb
 - lib/disposable/version.rb
 - test/composition_test.rb
 - test/test_helper.rb
-- test/twin/active_record_test.rb
 - test/twin/composition_test.rb
 - test/twin/twin_test.rb
 homepage: ''
@@ -187,7 +150,6 @@ summary: Domain-Oriented Refactoring Framework.
 test_files:
 - test/composition_test.rb
 - test/test_helper.rb
-- test/twin/active_record_test.rb
 - test/twin/composition_test.rb
 - test/twin/twin_test.rb
 has_rdoc: 

data/test/twin/active_record_test.rb

@@ -1,227 +0,0 @@
-require 'test_helper'
-
-class Album < ActiveRecord::Base
-  has_many :songs
-end
-
-class Song < ActiveRecord::Base
-  belongs_to :album
-end
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => "#{Dir.pwd}/database.sqlite3"
-)
-
-# ActiveRecord::Schema.define do
-#   create_table :songs do |table|
-#     table.column :title, :string
-#     table.column :album_id, :integer
-#     table.timestamps
-#   end
-
-#    create_table :albums do |table|
-#     table.column :name, :string
-#     table.timestamps
-#   end
-# end
-
-
-class TwinActiveRecordTest < MiniTest::Spec
-  module Twin
-    class Album < Disposable::Twin
-      property :id
-      property :name
-      collection :songs, :twin => lambda { |*| Twin::Song }
-
-      model ::Album
-    end
-
-    class Song < Disposable::Twin
-      property :id
-      property :title
-      property :album, :twin => Album
-
-      model ::Song
-    end
-  end
-
-
-  # new models
-  describe "::from, nested circular dependency" do
-    let (:song) { ::Song.new(:title => "Broken", :album => album) }
-    let (:album) { ::Album.new(:name => "The Process Of  Belief") }
-
-    before { album.songs = [song] } # circular dependency.
-
-    let(:twin) { Twin::Song.from(song) }
-
-    it { twin.album.songs.must_equal [twin] }
-  end
-
-  # existing, nested, models
-  describe "::from existing models, nested circular dependency" do
-    let (:song) { ::Song.create(:title => "Broken", :album => album) }
-    let (:album) { ::Album.create(:name => "The Process Of  Belief") }
-
-    before { album.songs.must_equal [song] } # circular dependency.
-
-    let(:twin) { Twin::Song.from(song) }
-
-    it { twin.album.songs.must_equal [twin] }
-
-    it do
-      twin.save
-      twin.album.songs.must_equal [twin]
-    end
-  end
-
-
-  describe "::find" do
-    let (:song_model) { ::Song.create(:title => "Savage") }
-    subject { Twin::Song.find(song_model.id) }
-
-    it { subject.id.must_equal song_model.id }
-    it { subject.title.must_equal "Savage" }
-    it { subject.album.must_equal nil }
-  end
-
-
-  describe "::finders" do
-    before {
-      DatabaseCleaner.clean
-      savage
-      starlight
-    }
-    let (:savage)    { ::Song.create(:title => "Savage") }
-    let (:starlight) { ::Song.create(:title => "Starlight") }
-
-    describe "collections" do
-      subject { Twin::Song.finders.all }
-
-      it { subject.size.must_equal 2 }
-
-      it { subject[0].must_be_kind_of Twin::Song }
-      it { subject[0].id.must_equal savage.id }
-      it { subject[0].title.must_equal "Savage" }
-
-      it { subject[1].must_be_kind_of Twin::Song }
-      it { subject[1].id.must_equal starlight.id }
-      it { subject[1].title.must_equal "Starlight" }
-    end
-
-    describe "::where" do
-      subject { Twin::Song.finders.where(:title => "Starlight") }
-
-      it { subject.size.must_equal 1 }
-
-      it { subject[0].must_be_kind_of Twin::Song }
-      it { subject[0].id.must_equal starlight.id }
-      it { subject[0].title.must_equal "Starlight" }
-    end
-  end
-
-
-  describe "::save, nested not set" do
-    let (:twin) { Twin::Song.new(:title => "1.80 Down") }
-    before { twin.save }
-    subject { ::Song.find(twin.id) }
-
-    it { subject.attributes.slice("id", "title").
-      must_equal({"id" => subject.id, "title" => "1.80 Down"}) }
-
-    it { subject.album.must_equal nil }
-  end
-
-
-  describe "::save, nested present" do
-    let (:song) { ::Song.new(:title => "Broken", :album => album) }
-    let (:album) { ::Album.new(:name => "The Process Of  Belief") }
-
-    let(:twin) { Twin::Song.from(song) }
-
-    before { twin.save } # propagate album.save
-
-    subject { ::Song.find(twin.id) }
-
-    it { subject.attributes.slice("id", "title").
-      must_equal({"id" => subject.id, "title" => "Broken"}) }
-
-    it { subject.album.must_equal album }
-    it { subject.album.id.wont_equal nil } # FIXME: this only works because song is saved after album.
-  end
-
-
-  describe "::save, nested new" do
-    let(:twin) { Twin::Song.new(:title => "How It Goes", :album => Twin::Album.new(:name => "Billy Talent")) }
-
-    before { twin.save } # propagate album.save
-
-    subject { ::Song.find(twin.id) }
-
-    it {
-      subject.attributes.slice("id", "title").
-      must_equal({"id" => subject.id, "title" => "How It Goes"}) }
-
-    it { subject.album.attributes.slice("name").must_equal("name" => "Billy Talent") }
-  end
-end
-
-
-class TwinActiveRecordAsTest < MiniTest::Spec
-  module Twin
-    class Album < Disposable::Twin
-      property :id
-      property :album_name, :as => :name
-
-      model ::Album
-    end
-
-    class Song < Disposable::Twin
-      property :id
-      property :song_title, :as => :title
-      property :record, :twin => Album, :as => :album
-
-      model ::Song
-    end
-  end
-
-
-  describe "::from" do
-     # (existing models)
-    let (:song) { ::Song.new(:title => "Broken", :album => album) }
-    let (:album) { ::Album.new(:name => "The Process Of Belief") }
-
-    let(:twin) { Twin::Song.from(song) }
-
-    it { twin.song_title.must_equal "Broken" }
-    it { twin.record.album_name.must_equal "The Process Of Belief" }
-  end
-
-
-  describe "#save" do
-    # existing models
-    let (:song) { ::Song.new(:title => "Broken", :album => album) }
-    let (:album) { ::Album.new(:name => "The Process Of  Belief") }
-
-    let(:twin) { Twin::Song.from(song) }
-
-    before do
-      twin.song_title = "Emo Boy"
-      twin.record.album_name = "Rode Hard And Put Away Wet"
-
-      twin.save
-    end
-
-    let (:ar_song) { ::Song.find(twin.id) }
-    let (:ar_album) { ar_song.album }
-
-    it { ar_song.attributes.slice("id", "title").
-      must_equal({"id" => ar_song.id, "title" => "Emo Boy"}) }
-
-    it { ar_album.must_equal album }
-    it("xxx") { ar_album.name.must_equal "Rode Hard And Put Away Wet" }
-    it { ar_album.id.wont_equal nil } # FIXME: this only works because song is saved after album.
-  end
-
-end