fedora_lens 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59868cf695e91e962aacef17bd8ca68be6fd43f4
-  data.tar.gz: b521e38a55129333c18b9f29e4d2e48246632e46
+  metadata.gz: 65cadbc75268a27e1ca476cd033f2fb7df5d9dd0
+  data.tar.gz: 5eac3438dced3e625013d9b635e3a8c9b4915f2e
 SHA512:
-  metadata.gz: 12bb8eebff4fbfb97d88e482e6ada5e0fd5a23b433ed5a748441210cc4ddea23d7069ad5ad07df63039148ab7083432f528df3df4f2497c7a5671be21cfb6e48
-  data.tar.gz: 67531804cf5e3ea11544ff2191ccc1710006a2a83c6358a68b86b5ff18645823e4b216b0587a402673bb3c06a2e2aa41d0046739f1c920a11cc018ef0ef8400b
+  metadata.gz: fe8c4ba5b7af3b15a77a447d402aee0b4021fda668068d5a228a88dcb2cecfd13bf2947998d7f8da68bddcce2969f3dbea66158c1d077806c9deb16021e9eefe
+  data.tar.gz: 9d68f7494ed6e9c609d255d7113439a93f8cef35bdd67111a6735048f7d190b05cda5d11ea35e1ae0f32f081e6845a0d910502a7548403600c44a6cc788f93a5

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "ldp", github: 'cbeer/ldp'
 gem 'jettywrapper'
 
 group :development, :test do

data/fedora_lens.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rdf-turtle', '~> 1.1.2'
   spec.add_dependency 'activemodel', '>= 4.0.2', "< 5.0"
   spec.add_dependency 'nokogiri', '~> 1.6.1'
-  spec.add_dependency 'ldp'
+  spec.add_dependency 'ldp', '0.0.3'
 end

data/lib/fedora_lens/attribute_methods/declarations.rb

@@ -0,0 +1,40 @@
+module FedoraLens
+  module AttributeMethods
+    module Declarations
+      extend ActiveSupport::Concern
+
+      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
+      end
+
+      module ClassMethods
+        def attribute(name, path)
+          raise AttributeNotSupportedException if name.to_sym == :id
+          attributes_as_lenses[name] = path.map{|s| coerce_to_lens(s)}
+          generate_method(name)
+          orm_to_hash = nil # force us to rebuild the aggregate_lens in case it was already built.
+        end
+
+        private
+          def coerce_to_lens(path_segment)
+            if path_segment.is_a? RDF::URI
+              Lenses.get_predicate(path_segment)
+            else
+              path_segment
+            end
+          end
+      end
+    end
+  end
+end

data/lib/fedora_lens/attribute_methods.rb

@@ -37,21 +37,7 @@ 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
-
-
-      
+      include Declarations
       initialize_generated_modules
       include Read
       include Write
@@ -127,23 +113,7 @@ module FedoraLens
         @generated_attribute_methods = Module.new { extend Mutex_m }
         include @generated_attribute_methods
       end
-
-      def attribute(name, path, options={})
-        raise AttributeNotSupportedException if name.to_sym == :id
-        attributes_as_lenses[name] = path.map{|s| coerce_to_lens(s)}
-        generate_method(name)
-        orm_to_hash = nil # force us to rebuild the aggregate_lens in case it was already built.
-      end
-
       private
-        def coerce_to_lens(path_segment)
-          if path_segment.is_a? RDF::URI
-            Lenses.get_predicate(path_segment)
-          else
-            path_segment
-          end
-        end
-
         # @param name [Symbol] name of the attribute to generate
         def generate_method(name)
           generated_attribute_methods.synchronize do

data/lib/fedora_lens/lenses.rb

@@ -70,14 +70,12 @@ module FedoraLens
       def orm_to_hash(name_to_lens)
         Lens[
           get: lambda do |orm|
-            name_to_lens.reduce({}) do |hash, pair|
-              key, lens = pair
+            name_to_lens.inject({}) do |hash, (key, lens)|
               hash.merge(key => lens.get(orm))
             end
           end,
           put: lambda do |orm, hash|
-            name_to_lens.each do |pair|
-              key, lens = pair
+            name_to_lens.each do |(key, lens)|
               lens.put(orm, hash[key])
             end
             orm
@@ -103,13 +101,38 @@ module FedoraLens
         ]
       end
 
-      def get_predicate(predicate)
+      def empty_property(graph, rdf_subject, predicate, should_delete)
+        if should_delete
+          graph.query([rdf_subject, predicate, nil]).each_statement do |statement|
+            if should_delete.call(statement.object)
+              graph.delete(statement)
+            end
+          end
+        else
+          graph.delete([rdf_subject, predicate, nil])
+        end
+      end
+
+      # @param [RDF::URI] predicate
+      # @param [Hash] opts
+      # @option opts [Proc] :select a proc that takes the object and returns 
+      #                             true if it should be included in this subset
+      #                             of the predicates.  Used for storing
+      #                             different classes of objects under different
+      #                             attribute names even though they all use the
+      #                             same predicate.
+      def get_predicate(predicate, opts = {})
         Lens[
           get: lambda do |orm|
-            orm.value(predicate)
+            values = orm.value(predicate)
+            if opts[:select]
+              values.select { |val| opts[:select].call(val) }
+            else
+              values
+            end
           end,
           put: lambda do |orm, values|
-            orm.graph.delete([orm.resource.subject_uri, predicate, nil])
+            empty_property(orm.graph, orm.resource.subject_uri, predicate, opts[:select])
             Array(values).each do |value|
               orm.graph.insert([orm.resource.subject_uri, predicate, value])
             end

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/fedora_lens.rb

@@ -20,6 +20,7 @@ module FedoraLens
     extend ActiveSupport::Autoload
 
     eager_autoload do
+      autoload :Declarations
       autoload :Read
       autoload :Write
     end
@@ -85,7 +86,7 @@ module FedoraLens
   end
 
   def id
-    URI.parse(uri).to_s.sub(HOST + PATH, '') if uri.present?
+    self.class.uri_to_id(URI.parse(uri)) if uri.present?
   end
 
   protected
@@ -148,6 +149,10 @@ module FedoraLens
       "#{HOST}#{PATH}#{id}"
     end
 
+    def uri_to_id(uri)
+      uri.to_s.sub(HOST + PATH, '')
+    end
+
     def create(data)
       model = self.new(data)
       model.save
@@ -156,9 +161,8 @@ module FedoraLens
 
     def orm_to_hash
       if @orm_to_hash.nil?
-        aggregate_lens = attributes_as_lenses.reduce({}) do |acc, pair|
-          name, path = pair
-          lens = path.reduce {|outer, inner| Lenses.compose(outer, inner)}
+        aggregate_lens = attributes_as_lenses.inject({}) do |acc, (name, path)|
+          lens = path.inject {|outer, inner| Lenses.compose(outer, inner)}
           acc.merge(name => lens)
         end
         @orm_to_hash = Lenses.orm_to_hash(aggregate_lens)

data/spec/fedora_lens_spec.rb

@@ -3,19 +3,11 @@ require 'spec_helper'
 describe FedoraLens do
   include ActiveModel::Lint::Tests
 
-  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
-
   # for ActiveModel::Lint::Tests
   def setup
     @model = TestClass.new
   end
 
-  subject { TestClass.new }
 
   # before do
   #   require 'logger'
@@ -24,133 +16,216 @@ describe FedoraLens do
   #   end
   # end
 
-  describe ".find" do
-    context "when the object doesn't exist" do
-      it "should raise an error" do
-        expect{ TestClass.find('bahvejlavawwv') }.to raise_error Ldp::NotFound
+
+  describe "context with a simple class" do
+    before do
+      class TestClass
+        include FedoraLens
+        attribute :title, [RDF::DC11.title, Lenses.single, Lenses.literal_to_string]
       end
     end
 
-    context "when the object exists" do
-      let(:existing) { TestClass.create(title: "created resource") }
-      subject { TestClass.find(existing.id) }
-      it { should be_kind_of TestClass }
-      its(:id) { should eq existing.id }
+    after do
+      Object.send(:remove_const, :TestClass)
     end
-  end
 
-  describe ".delete" do
-    subject { TestClass.create(title: "created resource") }
-
-    it "should be deleted" do
-      subject.delete
-      expect{ TestClass.find(subject.id) }.to raise_error Ldp::NotFound
-    end
-  end
+    subject { TestClass.new }
 
-  describe ".create" do
-    subject { TestClass.create(attributes) }
+    describe ".find" do
+      context "when the object doesn't exist" do
+        it "should raise an error" do
+          expect{ TestClass.find('bahvejlavawwv') }.to raise_error Ldp::NotFound
+        end
+      end
 
-    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"
+      context "when the object exists" do
+        let(:existing) { TestClass.create(title: "created resource") }
+        subject { TestClass.find(existing.id) }
+        it { should be_kind_of TestClass }
+        its(:id) { should eq existing.id }
       end
     end
 
-    context "with nil" do
-      let(:attributes) { nil }
-      it "creates a resource" do
-        expect(TestClass.find(subject.id)).to be_kind_of TestClass
+    describe ".delete" do
+      subject { TestClass.create(title: "created resource") }
+
+      it "should be deleted" do
+        subject.delete
+        expect{ TestClass.find(subject.id) }.to raise_error Ldp::NotFound
       end
     end
-  end
 
-  describe "#id" do
-    it "should not have 'fedora' in the id" do
-      m = TestClass.new('http://localhost:8983/fedora/rest/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52')
-      expect(m.id).to eq '/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52'
-    end
-  end
+    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
 
-  describe ".save" do
-    it "saves a new resource" do
-      m = TestClass.new(title: "created resource")
-      m.save
-      TestClass.find(m.id).title.should eq "created resource"
+      context "with nil" do
+        let(:attributes) { nil }
+        it "creates a resource" do
+          expect(TestClass.find(subject.id)).to be_kind_of TestClass
+        end
+      end
     end
 
-    it "saves an updated resource" do
-      m = TestClass.create(title: "created resource")
-      m.reload
-      m.title = "changed title"
-      m.save
-      TestClass.find(m.id).title.should eq "changed title"
+    describe "#id" do
+      it "should not have 'fedora' in the id" do
+        m = TestClass.new('http://localhost:8983/fedora/rest/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52')
+        expect(m.id).to eq '/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52'
+      end
     end
 
-    context "with a supplied id" do
-      subject { TestClass.new(TestClass.id_to_uri('foobar')) }
 
-      it "saves with that id" do
-        expect(subject.new_record?).to be_true
-        expect(subject.save).to be_true
-        expect(subject.new_record?).to be_false
+    describe ".save" do
+      it "saves a new resource" do
+        m = TestClass.new(title: "created resource")
+        m.save
+        TestClass.find(m.id).title.should eq "created resource"
       end
 
-    end
+      it "saves an updated resource" do
+        m = TestClass.create(title: "created resource")
+        m.reload
+        m.title = "changed title"
+        m.save
+        TestClass.find(m.id).title.should eq "changed title"
+      end
 
-  end
+      context "with a supplied id" do
+        subject { TestClass.new(TestClass.id_to_uri('foobar')) }
 
-  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 "saves with that id" do
+          expect(subject.new_record?).to be_true
+          expect(subject.save).to be_true
+          expect(subject.new_record?).to be_false
+        end
 
-    it "should return nil if it hasn't been set" do
-      expect(subject.title).to be_nil
+      end
     end
+  end
 
-    it "has a [] setter/getter" do
-      subject[:title] = 'foo'
-      expect(subject[:title]).to eq 'foo'
+  context "with a class that has many attributes" do
+    before do
+      class TestClass
+        include FedoraLens
+        attribute :title, [RDF::DC11.title, Lenses.single, Lenses.literal_to_string]
+        attribute :subject, [RDF::DC11.subject, Lenses.single, Lenses.literal_to_string]
+      end
     end
 
-    it "loads from rdf" do
+    after do
+      Object.send(:remove_const, :TestClass)
     end
 
-    it "mixes rdf and xml" do
-    end
+    subject { TestClass.new }
+
+    describe ".attribute" do
+      it "makes a setter/getter" do
+        subject.title = "foo"
+        subject.subject = "bar"
+        expect(subject.title).to eq "foo"
+        expect(subject.subject).to eq "bar"
+      end
+
 
-    context "that are inherited" do
-      class TestSubclass < TestClass
-        attribute :description, [RDF::DC11.description, Lenses.single, Lenses.literal_to_string]
+      it "should return nil if it hasn't been set" do
+        expect(subject.title).to be_nil
       end
 
-      subject { TestSubclass.new }
+      it "has a [] setter/getter" do
+        subject[:title] = 'foo'
+        expect(subject[:title]).to eq 'foo'
+      end
 
-      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"
+      it "loads from rdf" do
+      end
+
+      it "mixes rdf and xml" do
+      end
+
+      context "that are inherited" do
+        before do
+          class TestClass2
+            include FedoraLens
+
+            class << self
+              def only_foos
+                lambda { |obj| obj == 'foo' }
+              end
+
+              def only_bars
+                lambda { |obj| obj == 'bar' }
+              end
+            end
+
+            attribute :subject, [Lenses.get_predicate(RDF::DC11.subject, select: only_foos), Lenses.literals_to_strings]
+            attribute :subject2, [Lenses.get_predicate(RDF::DC11.subject, select: only_bars), Lenses.literals_to_strings]
+          end
+        end
+        after do
+          Object.send(:remove_const, :TestClass2)
+        end
+
+        let(:original_values) { { 'subject' => ['foo'], 'subject2' => ['bar'] } }
+
+        subject { TestClass2.new(original_values) }
+        before { subject.send(:push_attributes_to_orm) }
+
+
+        it "should multiplex the separate attributes into one predicate" do
+          expect(subject.orm.graph.dump(:ttl)).to eq( 
+            "\n<> <http://purl.org/dc/elements/1.1/subject> \"foo\",\n" +
+            "     \"bar\" .\n")
+        end
+
+        it "should demultiplex the predicate into separate attributes into one predicat" do
+          expect(subject.send(:get_attributes_from_orm, subject.orm)).to eq original_values
+        end
       end
 
-      context "a sibling class" do
-        class TestAnotherSubclass < TestClass
+      context "that are inherited" do
+        before do
+          class TestSubclass < TestClass
+            attribute :description, [RDF::DC11.description, Lenses.single, Lenses.literal_to_string]
+          end
+        end
+        after do
+          Object.send(:remove_const, :TestSubclass)
         end
 
-        subject { TestAnotherSubclass }
+        subject { TestSubclass.new }
 
-        it "instances should not have accessor methods defined by the other sibling" do
-          expect { subject.new.description }.to raise_error NoMethodError
+        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
 
-        it "should not have attribute lenses defined by the other sibling" do
-          expect(TestAnotherSubclass.attributes_as_lenses.keys).to_not include "description"
+        context "a sibling class" do
+          before do
+            class TestAnotherSubclass < TestClass
+            end
+          end
+
+          after do
+            Object.send(:remove_const, :TestAnotherSubclass)
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,16 +119,16 @@ dependencies:
   name: ldp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 description: ''
 email:
 - justin@curationexperts.com
@@ -149,6 +149,7 @@ files:
 - fedora_lens.gemspec
 - lib/fedora_lens.rb
 - lib/fedora_lens/attribute_methods.rb
+- lib/fedora_lens/attribute_methods/declarations.rb
 - lib/fedora_lens/attribute_methods/read.rb
 - lib/fedora_lens/attribute_methods/write.rb
 - lib/fedora_lens/errors.rb