fedora_lens 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b83b0c8b5f99413f3eec0f08a0b75609f35a7c
-  data.tar.gz: dec9a72626b9c00511782586aa8b904f63558380
+  metadata.gz: c7eaf60a6e220490635c6c9eef2c99cbe7453eaf
+  data.tar.gz: a0e300edb02fbd2abfdeee0c5368e43df86a35e1
 SHA512:
-  metadata.gz: 07dd2afaa5f9c46f2ecdbeba122c0aee828edf3240f2f52c37c3ecee72ad7ffef3a1a636389bfd6329b6997eb9b53cfcf4dd35681e0f64771a061d2294e25582
-  data.tar.gz: 7c9928a40da331750b368189327bef44f446c82a9ea05ccf50f5be08682bf811e17927e2e2cb2de3d5f67d37265feed71f87231c87f87f2625bce683a40d35c6
+  metadata.gz: 4bd613f55ea525abba224a54ad39df2fcb0e8779bdbd4f95238c81e3c5b74dde7aeffb771e56b1d0bfdacdd2b3ce902db62747854b8cc4dfc682977f5eab7d06
+  data.tar.gz: 75a8cf0ac3f5d4ce1f7f26d3877e1cb64cc5d7bdd419458156cb84177d1ae2601cb6dbc6c3a40f9bb7fc2c2ff6029c126e81fcb39d077c5a643bb32fd93725b0

data/lib/fedora_lens/attribute_methods.rb

@@ -39,6 +39,18 @@ module FedoraLens
     included do
       class_attribute :attributes_as_lenses
       self.attributes_as_lenses = {}.with_indifferent_access
+      class << self
+        def inherited_with_lenses(kls) #:nodoc:
+          ## Do some inheritance logic that doesn't override Base.inherited
+          inherited_without_lenses kls
+          # each subclass should get a copy of the parent's attributes_as_lenses table,
+          # it should not add to the parent's definition table.
+          kls.attributes_as_lenses = kls.attributes_as_lenses.dup
+        end
+        alias_method_chain :inherited, :lenses
+      end
+
+
       
       initialize_generated_modules
       include Read

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/fedora_lens.rb

@@ -69,7 +69,6 @@ module FedoraLens
   end
 
   def save
-    @orm = self.class.orm_to_hash.put(@orm, @attributes)
     new_record? ? create_record : update_record
   end
 
@@ -111,12 +110,14 @@ module FedoraLens
     end
 
     def create_record
+      push_attributes_to_orm
       orm.resource.create
       @new_record = false
       true
     end
 
     def update_record
+      push_attributes_to_orm
       # Fedora errors out when you try to set the rdf:type
       # see https://github.com/cbeer/ldp/issues/2
       orm.graph.delete([@orm.resource.subject_uri,
@@ -129,6 +130,10 @@ module FedoraLens
 
   private
 
+  def push_attributes_to_orm
+    @orm = self.class.orm_to_hash.put(@orm, @attributes)
+  end
+
   def get_attributes_from_orm(orm)
     self.class.orm_to_hash.get(orm).with_indifferent_access
   end

data/spec/fedora_lens_spec.rb

@@ -6,6 +6,7 @@ describe FedoraLens do
   class TestClass
     include FedoraLens
     attribute :title, [RDF::DC11.title, Lenses.single, Lenses.literal_to_string]
+    attribute :size, [RDF::DC11.subject, Lenses.single, Lenses.literal_to_string]
     # attribute :xml_title, [RDF::DC11.title, Lenses.single]
   end
 
@@ -16,6 +17,13 @@ describe FedoraLens do
 
   subject { TestClass.new }
 
+  # before do
+  #   require 'logger'
+  #   Ldp.logger = Logger.new(STDOUT).tap do |l|
+  #     l.level = Logger::DEBUG
+  #   end
+  # end
+
   describe ".find" do
     context "when the object doesn't exist" do
       it "should raise an error" do
@@ -42,12 +50,14 @@ describe FedoraLens do
 
   describe ".create" do
     subject { TestClass.create(attributes) }
+
     context "with a hash" do
       let(:attributes) { { title: "created resource" } }
       it "creates a resource" do
         expect(TestClass.find(subject.id).title).to eq "created resource"
       end
     end
+
     context "with nil" do
       let(:attributes) { nil }
       it "creates a resource" do
@@ -95,7 +105,9 @@ describe FedoraLens do
   describe ".attribute" do
     it "makes a setter/getter" do
       subject.title = "foo"
+      subject.size = "bar"
       expect(subject.title).to eq "foo"
+      expect(subject.size).to eq "bar"
     end
 
     it "should return nil if it hasn't been set" do
@@ -112,5 +124,35 @@ describe FedoraLens do
 
     it "mixes rdf and xml" do
     end
+
+    context "that are inherited" do
+      class TestSubclass < TestClass
+        attribute :description, [RDF::DC11.description, Lenses.single, Lenses.literal_to_string]
+      end
+
+      subject { TestSubclass.new }
+
+      it "should have accessor methods defined by the parent" do
+        subject.title = "foo"
+        subject.description = "bar"
+        expect(subject.title).to eq "foo"
+        expect(subject.description).to eq "bar"
+      end
+
+      context "a sibling class" do
+        class TestAnotherSubclass < TestClass
+        end
+
+        subject { TestAnotherSubclass }
+
+        it "instances should not have accessor methods defined by the other sibling" do
+          expect { subject.new.description }.to raise_error NoMethodError
+        end
+
+        it "should not have attribute lenses defined by the other sibling" do
+          expect(TestAnotherSubclass.attributes_as_lenses.keys).to_not include "description"
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Justin Coyne