yeti 0.2.0 → 0.3.0

data/lib/yeti/editor.rb

@@ -6,32 +6,32 @@ module Yeti
     attr_reader :context
     delegate :id, :to_param, :persisted?, to: :edited
 
-    def initialize(context, given_id=nil)
-      @context = context
-      @given_id = given_id
+    def self.from_id(context, id)
+      new context, (find_by_id id if id)
     end
 
-    def errors
-      @errors ||= ::Yeti::Errors.new(
-        self,
-        untranslated: self.class.untranslated?
-      )
+    def self.find_by_id(id)
+      raise NotImplementedError, "#{inspect}.find_by_id"
     end
 
-    def edited
-      @edited ||= if given_id
-        find_by_id given_id
-      else
-        new_object
-      end
+    def self.new_object
+      raise NotImplementedError, "#{inspect}.new_object"
+    end
+
+    def initialize(context, edited=nil)
+      @context = context
+      @edited = edited
     end
 
-    def find_by_id(id)
-      raise NotImplementedError, "#{self.class}#find_by_id"
+    def edited
+      @edited ||= self.class.new_object
     end
 
-    def new_object
-      raise NotImplementedError, "#{self.class}#new_object"
+    def errors
+      @errors ||= ::Yeti::Errors.new(
+        self,
+        untranslated: self.class.untranslated?
+      )
     end
 
     def update_attributes(attrs)
@@ -79,8 +79,6 @@ module Yeti
 
   private
 
-    attr_reader :given_id
-
     def self.attribute(name, opts={})
       opts[:attribute_name] = name
       opts[:from] = :edited unless opts.has_key? :from

data/lib/yeti/version.rb

@@ -1,3 +1,3 @@
 module Yeti
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/yeti/viewer.rb

@@ -0,0 +1,21 @@
+module Yeti
+  class Viewer
+
+    attr_reader :context, :decorated
+    delegate :id, :to_param, :persisted?, to: :decorated
+
+    def self.from_id(context, id)
+      new context, (find_by_id id if id)
+    end
+
+    def self.find_by_id(id)
+      raise NotImplementedError, "#{inspect}.find_by_id"
+    end
+
+    def initialize(context, decorated)
+      @context = context
+      @decorated = decorated
+    end
+
+  end
+end

data/lib/yeti.rb

@@ -4,6 +4,7 @@ require "active_model"
 require "string_cleaner"
 require "yeti/context"
 require "yeti/errors"
+require "yeti/viewer"
 require "yeti/editor"
 require "yeti/search"
 require "yeti/version"

data/spec/yeti/editor_spec.rb

@@ -1,61 +1,95 @@
 require "spec_helper"
 
-describe Yeti::Editor do
+describe ::Yeti::Editor do
   let(:context){ mock :context }
-  subject{ Yeti::Editor.new context }
-  it "keeps given context" do
-    subject.context.should be context
+  subject{ described_class.new context }
+  it ".new_object is virtual" do
+    lambda do
+      described_class.new_object
+    end.should raise_error NotImplementedError, "Yeti::Editor.new_object"
   end
-  it "#find_by_id is virtual" do
-    lambda{ subject.find_by_id 1 }.should raise_error NotImplementedError
+  it ".find_by_id is virtual" do
+    lambda do
+      described_class.find_by_id 1
+    end.should raise_error NotImplementedError, "Yeti::Editor.find_by_id"
   end
-  it "#new_object is virtual" do
-    lambda{ subject.new_object }.should raise_error NotImplementedError
-  end
-  it "#persist! is virtual" do
-    lambda{ subject.persist! }.should raise_error NotImplementedError
-  end
-  context "with a given id" do
-    let(:edited){ mock :edited }
-    subject{ Yeti::Editor.new context, 1 }
-    before{ subject.stub(:find_by_id).with(1).and_return edited }
-    it "uses #find_by_id to find the main object being edited" do
-      subject.edited.should be edited
-    end
-    it "delegates persisted? to edited" do
-      edited.stub(:persisted?).and_return(expected = mock)
-      subject.persisted?.should be expected
-    end
-  end
-  context "with id nil" do
-    let(:edited){ mock :edited }
-    subject{ Yeti::Editor.new context, nil }
-    before{ subject.stub(:new_object).and_return edited }
-    it "uses #new_object to initialize main object being edited" do
-      subject.edited.should be edited
+  describe "initialization" do
+    let(:new_object){ mock :new_object }
+    let(:existing_object){ mock :existing_object }
+    context "with context only" do
+      before{ described_class.stub(:new_object).and_return new_object }
+      it "keeps given context" do
+        subject.context.should be context
+      end
+      it "#persist! is virtual" do
+        lambda do
+          subject.persist!
+        end.should raise_error NotImplementedError, "Yeti::Editor#persist!"
+      end
+      it "uses .new_object to initialize edited object" do
+        subject.edited.should == new_object
+      end
+      it "delegates id to edited object" do
+        should delegates(:id).to :new_object
+      end
+      it "delegates to_param to edited object" do
+        should delegates(:to_param).to :new_object
+      end
+      it "delegates persisted? edited object" do
+        should delegates(:persisted?).to :new_object
+      end
     end
-    it "delegates persisted? to edited" do
-      edited.stub(:persisted?).and_return(expected = mock)
-      subject.persisted?.should be expected
+    context "initialize with context and object to edit" do
+      subject{ described_class.new context, existing_object }
+      it "keeps given context" do
+        subject.context.should be context
+      end
+      it "#persist! is virtual" do
+        lambda do
+          subject.persist!
+        end.should raise_error NotImplementedError, "Yeti::Editor#persist!"
+      end
+      it "delegates id to edited object" do
+        should delegates(:id).to :existing_object
+      end
+      it "delegates to_param to edited object" do
+        should delegates(:to_param).to :existing_object
+      end
+      it "delegates persisted? edited object" do
+        should delegates(:persisted?).to :existing_object
+      end
     end
   end
-  context "without id" do
-    let(:edited){ mock :edited }
-    before{ subject.stub(:new_object).and_return edited }
-    it "uses #new_object to initialize main object being edited" do
-      subject.edited.should be edited
+  describe ".from_id(context, given_id)" do
+    let(:new_object){ mock :new_object }
+    let(:existing_object){ mock :existing_object, id: 1 }
+    subject{ described_class.from_id context, given_id }
+    context "when given_id is nil" do
+      let(:given_id){ nil }
+      it "uses .new_object to generate object to edit" do
+        described_class.should_receive(:new_object).and_return new_object
+        subject.edited.should be new_object
+      end
     end
-    it "delegates persisted? to edited" do
-      edited.stub(:persisted?).and_return(expected = mock)
-      subject.persisted?.should be expected
+    context "when given_id is not nil" do
+      let(:given_id){ "1" }
+      it "uses .find_by_id to find object to edit" do
+        described_class.should_receive(:find_by_id).with("1").and_return do
+          existing_object
+        end
+        subject.edited.should be existing_object
+        subject.id.should be 1
+      end
     end
   end
   context "when not valid" do
-    before{ subject.stub(:valid?).and_return false }
     it "#save returns false" do
+      subject.should_receive(:valid?).and_return false
+      subject.should_not_receive :persist!
       subject.save.should be false
     end
     it "#save(validate: false) calls persist! then returns true" do
+      subject.should_not_receive :valid?
       subject.should_receive :persist!
       subject.save(validate: false).should be true
     end
@@ -67,19 +101,19 @@ describe Yeti::Editor do
     end
   end
   context "editor of one record" do
-    let :editor_class do
-      Class.new Yeti::Editor do
+    let :described_class do
+      Class.new ::Yeti::Editor do
         attribute :name
         validates_presence_of :name
         def self.name
           "ObjectEditor"
         end
+        def self.new_object
+          Struct.new(:id, :name).new nil, nil
+        end
       end
     end
     context "new record" do
-      subject{ editor_class.new context, nil }
-      let(:new_record){ mock :new_record, name: nil, id: nil }
-      before{ subject.stub(:new_object).and_return new_record }
       its(:id){ should be_nil }
       its(:name){ should be_nil }
       it "#name= converts input to string" do
@@ -120,7 +154,7 @@ describe Yeti::Editor do
           subject.should_not be_without_error
         end
         it "can return untranslated error messages" do
-          editor_class.class_eval do
+          described_class.class_eval do
             dont_translate_error_messages
           end
           subject.valid?
@@ -158,9 +192,8 @@ describe Yeti::Editor do
       end
     end
     context "existing record" do
-      subject{ editor_class.new context, 1 }
-      let(:existing_record){ mock :existing_record, name: "Anthony", id: 1 }
-      before{ subject.stub(:find_by_id).with(1).and_return existing_record }
+      let(:existing_object){ mock :existing_object, id: 1, name: "Anthony" }
+      subject{ described_class.new context, existing_object }
       it("gets id from record"){ subject.id.should be 1 }
       it "gets name from record" do
         subject.name.should == "Anthony"
@@ -193,26 +226,23 @@ describe Yeti::Editor do
     end
   end
   context "editor of multiple records" do
-    let :editor_class do
-      Class.new Yeti::Editor do
+    let(:existing_object){ Struct.new(:id, :name).new 1, "Anthony" }
+    subject do
+      Class.new described_class do
         attribute :name
         attribute :description, from: :related
         attribute :password, from: nil
         attribute :timestamp, from: ".timestamp_str"
         attribute :related_id, from: "related.id"
         attribute :invalid
-        def find_by_id(id)
-          Struct.new(:id, :name).new(id, "Anthony")
-        end
         def related
           Struct.new(:id, :description).new 2, "Business man"
         end
         def timestamp_str
           "2001-01-01"
         end
-      end
+      end.new context, existing_object
     end
-    subject{ editor_class.new context, 1 }
     it "attribute default value comes from edited" do
       subject.id.should == 1
       subject.name.should == "Anthony"
@@ -234,14 +264,13 @@ describe Yeti::Editor do
     end
   end
   describe "#mandatory?" do
-    let :editor_class do
-      Class.new Yeti::Editor do
+    subject do
+      Class.new described_class do
         validates_presence_of :name
         attribute :name
         attribute :password
-      end
+      end.new context
     end
-    subject{ editor_class.new context }
     it "is true for an attribute with validates_presence_of" do
       subject.mandatory?(:name).should be true
     end

data/spec/yeti/viewer_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe ::Yeti::Viewer do
+  let(:context){ mock :context }
+  subject{ described_class.new context }
+  it ".find_by_id is virtual" do
+    lambda do
+      described_class.find_by_id 1
+    end.should raise_error NotImplementedError, "Yeti::Viewer.find_by_id"
+  end
+  describe "initialization" do
+    let(:existing_object){ mock :existing_object }
+    subject{ described_class.new context, existing_object }
+    it "keeps given context" do
+      subject.context.should be context
+    end
+    it "keeps given object to decorate" do
+      subject.decorated.should be existing_object
+    end
+    it "delegates id to decorated object" do
+      should delegates(:id).to :existing_object
+    end
+    it "delegates to_param to decorated object" do
+      should delegates(:to_param).to :existing_object
+    end
+    it "delegates persisted? decorated object" do
+      should delegates(:persisted?).to :existing_object
+    end
+  end
+  describe ".from_id(context, given_id)" do
+    let(:existing_object){ mock :existing_object }
+    subject{ described_class.from_id context, "1" }
+    it "uses .find_by_id to find object to edit" do
+      described_class.should_receive(:find_by_id).with("1").and_return do
+        existing_object
+      end
+      subject.decorated.should be existing_object
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeti
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -93,11 +93,13 @@ files:
 - lib/yeti/errors.rb
 - lib/yeti/search.rb
 - lib/yeti/version.rb
+- lib/yeti/viewer.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/yeti/context_spec.rb
 - spec/yeti/editor_spec.rb
 - spec/yeti/search_spec.rb
+- spec/yeti/viewer_spec.rb
 - spec/yeti_spec.rb
 - yeti.gemspec
 homepage: ''
@@ -112,21 +114,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3787282194085503627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3787282194085503627
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Editor pattern simplifies edition of multiple objects at once using ActiveModel
@@ -136,4 +132,5 @@ test_files:
 - spec/yeti/context_spec.rb
 - spec/yeti/editor_spec.rb
 - spec/yeti/search_spec.rb
+- spec/yeti/viewer_spec.rb
 - spec/yeti_spec.rb