fedora_lens 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aed41f4f03e56d39025a4c4afc83c2f104fbe13
-  data.tar.gz: 67a75716a078d141c39762c027683aa815bd85bf
+  metadata.gz: 8ddccef7b4b1d4c0bf21e0afe5596f375b79ae40
+  data.tar.gz: f979c71a8daa29d9e291e6c2c06d4c3abd7c9223
 SHA512:
-  metadata.gz: 5b625651f21a93d934616e81deb447c1a3946fa146512a6d2ff15b737a95cab4fa1dfe0c7e4ad692a11dcb365d5dd5250432a5c72e98573a161df36671a31003
-  data.tar.gz: d70beed3541744109be8e91cc1aec93e40ebfc9e20b70a3df828f8476cb97b510ea96914ea62339abc75353135032a6e589daa6d4cf68ce700dcbea828fbc59f
+  metadata.gz: 8fef1c7a9b0b4bc6739d003278978791705661bec3dd8722cdbfa1e8c34f8f0b01700fa1bc39da55dc71258a3d82b2ddc74ee1c030b197651809af67b619cd79
+  data.tar.gz: 117fcc9c8a4236d629d2517a77c6b61ee84f004064d4d0c6abd1df77160faa2eb51ad8902c7d2a19c02ddc8f85bfd9cdcafb9d446ddb9b6bc70c4055363063d7

data/lib/fedora_lens.rb

@@ -1,222 +1,14 @@
-require 'rdf'
-require 'ldp'
-require 'rdf/turtle'
-require 'nokogiri'
 require 'active_model'
-require 'active_support/concern'
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/hash'
-require 'fedora_lens/errors'
+require 'fedora_lens/core'
 
 module FedoraLens
   extend ActiveSupport::Concern
-  extend ActiveSupport::Autoload
-  autoload :AttributeMethods
-
-  module AttributeMethods
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :Declarations
-      autoload :Read
-      autoload :Write
-    end
-  end
-
-  HOST = "http://localhost:8983/fedora/rest"
-
-  class << self
-    def connection
-      @@connection ||= Ldp::Client.new(host)
-    end
-
-    def host
-      HOST
-    end
-
-    def base_path
-      @@base_path ||= ''
-    end
-
-    # Set a base path if you want to put all your objects below a certain path
-    # example:
-    #   FedoraLens.base_path = '/text
-    def base_path= path
-      @@base_path =  path
-    end
-
-    def id_to_uri(id)
-      id = "/#{id}" unless id.start_with? '/'
-      id = FedoraLens.base_path + id unless id.start_with? "#{FedoraLens.base_path}/"
-      FedoraLens.host + id
-    end
-
-    def uri_to_id(uri)
-      uri.to_s.sub(FedoraLens.host + FedoraLens.base_path, '')
-    end
-  end
 
   included do
     extend ActiveModel::Naming
     include ActiveModel::Validations
     include ActiveModel::Conversion
-    include FedoraLens::AttributeMethods
-
-    attr_reader :orm
-  end
-
-  def initialize(subject_or_data = {}, data = nil)
-    init_core(subject_or_data, data)
-  end
-
-  def persisted?()      false end
-
-  def errors
-    obj = Object.new
-    def obj.[](key)         [] end
-    def obj.full_messages() [] end
-    obj
-  end
-
-  def read_attribute_for_validation(key)
-    @attributes[key]
-  end
-
-  def reload
-    @orm = @orm.reload
-    @attributes = get_attributes_from_orm(@orm)
-  end
-
-  def delete
-    @orm.resource.delete
-  end
-
-  def save
-    new_record? ? create_record : update_record
-  end
-
-  def save!
-    save || raise(RecordNotSaved)
-  end
-
-  def new_record?
-    @orm.resource.new?
-  end
-
-  def uri
-    @orm.try(:resource).try(:subject_uri).try(:to_s)
-  end
-
-  def id
-    self.class.uri_to_id(URI.parse(uri)) if uri.present?
-  end
-
-  protected
-    # This allows you to overide the initializer, but still use this behavior
-    def init_core(subject_or_data = {}, data = nil)
-      case subject_or_data
-        when Ldp::Resource::RdfSource
-          @orm = Ldp::Orm.new(subject_or_data)
-          @attributes = get_attributes_from_orm(@orm)
-        when NilClass, Hash
-          data = subject_or_data || {}
-          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new, FedoraLens.host + FedoraLens.base_path))
-          @attributes = data.with_indifferent_access
-        when String
-          data ||= {}
-          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, subject_or_data, RDF::Graph.new))
-          @attributes = data.with_indifferent_access
-        else
-          raise ArgumentError, "#{subject_or_data.class} is not acceptable"
-        end
-    end
-
-    def create_record
-      push_attributes_to_orm
-      create_and_fetch_attributes
-      true
-    end
-
-    def update_record
-      push_attributes_to_orm
-      update_and_fetch_attributes
-    end
-
-
-  private
-
-  def update_and_fetch_attributes
-    orm.save!.tap do
-      clear_cached_response
-      # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#lastModified
-      # TODO perhaps attributes could be lazily fetched
-      @attributes = get_attributes_from_orm(@orm)
-      clear_cached_response
-    end
-  end
-
-  def create_and_fetch_attributes
-      @orm = orm.create
-      # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#created
-      # TODO perhaps attributes could be lazily fetched
-      @attributes = get_attributes_from_orm(@orm)
-      clear_cached_response
-  end
-
-  # TODO this causes slowness because we're losing the cached GET response. However it prevents ETag exceptions caused when a
-  # subnode is added before an update.
-  def clear_cached_response
-    # This strips the current cached response (and ETag) from the current ORM to avoid ETag exceptions on the next update,
-    # since the etag will change if a child node is added.
-    @orm = Ldp::Orm.new @orm.resource.class.new @orm.resource.client, @orm.resource.subject
-  end
-
-
-  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
-
-  module ClassMethods
-    def find(id)
-      resource = Ldp::Resource::RdfSource.new(FedoraLens.connection, id_to_uri(id))
-      raise Ldp::NotFound if resource.new?
-      self.new(resource)
-    end
-
-    def id_to_uri(id)
-      FedoraLens.id_to_uri(id)
-    end
-
-    def uri_to_id(uri)
-      FedoraLens.uri_to_id(uri)
-    end
-
-    def create(data)
-      model = self.new(data)
-      model.save
-      model
-    end
-
-    def orm_to_hash
-      if @orm_to_hash.nil?
-        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)
-      end
-      @orm_to_hash
-    end
-
-    # def has_one(name, scope = nil, options = {})
-    #   ActiveRecord::Associations::Builder::HasOne.build(self, name, scope, options)
-    # end
+    include FedoraLens::Core
   end
 end
 

data/lib/fedora_lens/core.rb

@@ -0,0 +1,220 @@
+require 'rdf'
+require 'ldp'
+require 'active_support/concern'
+require 'active_support/core_ext/object'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/hash'
+require 'fedora_lens/errors'
+
+module FedoraLens
+  extend ActiveSupport::Autoload
+  autoload :AttributeMethods
+
+  module AttributeMethods
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Declarations
+      autoload :Read
+      autoload :Write
+    end
+  end
+
+  HOST = "http://localhost:8983/fedora/rest"
+
+  class << self
+    def connection
+      @@connection ||= Ldp::Client.new(host)
+    end
+
+    def host
+      HOST
+    end
+
+    def base_path
+      @@base_path ||= ''
+    end
+
+    # Set a base path if you want to put all your objects below a certain path
+    # example:
+    #   FedoraLens.base_path = '/text
+    def base_path= path
+      @@base_path =  path
+    end
+
+    def id_to_uri(id)
+      id = "/#{id}" unless id.start_with? '/'
+      id = FedoraLens.base_path + id unless id.start_with? "#{FedoraLens.base_path}/"
+      FedoraLens.host + id
+    end
+
+    def uri_to_id(uri)
+      uri.to_s.sub(FedoraLens.host + FedoraLens.base_path, '')
+    end
+  end
+
+  module Core
+    extend ActiveSupport::Concern
+
+    included do
+      include FedoraLens::AttributeMethods
+      attr_reader :orm
+    end
+
+    def initialize(subject_or_data = {}, data = nil)
+      init_core(subject_or_data, data)
+    end
+
+    def persisted?()      false end
+
+    def errors
+      obj = Object.new
+      def obj.[](key)         [] end
+      def obj.full_messages() [] end
+      obj
+    end
+
+    def read_attribute_for_validation(key)
+      @attributes[key]
+    end
+
+    def reload
+      @orm = @orm.reload
+      @attributes = get_attributes_from_orm(@orm)
+    end
+
+    def delete
+      @orm.resource.delete
+    end
+
+    def save
+      new_record? ? create_record : update_record
+    end
+
+    def save!
+      save || raise(RecordNotSaved)
+    end
+
+    def new_record?
+      @orm.resource.new?
+    end
+
+    def uri
+      @orm.try(:resource).try(:subject_uri).try(:to_s)
+    end
+
+    def id
+      self.class.uri_to_id(URI.parse(uri)) if uri.present?
+    end
+
+    protected
+      # This allows you to overide the initializer, but still use this behavior
+      def init_core(subject_or_data = {}, data = nil)
+        case subject_or_data
+          when Ldp::Resource::RdfSource
+            @orm = Ldp::Orm.new(subject_or_data)
+            @attributes = get_attributes_from_orm(@orm)
+          when NilClass, Hash
+            data = subject_or_data || {}
+            @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new, FedoraLens.host + FedoraLens.base_path))
+            @attributes = data.with_indifferent_access
+          when String
+            data ||= {}
+            @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, subject_or_data, RDF::Graph.new))
+            @attributes = data.with_indifferent_access
+          else
+            raise ArgumentError, "#{subject_or_data.class} is not acceptable"
+          end
+      end
+
+      def create_record
+        push_attributes_to_orm
+        create_and_fetch_attributes
+        true
+      end
+
+      def update_record
+        push_attributes_to_orm
+        update_and_fetch_attributes
+      end
+
+
+    private
+
+    def update_and_fetch_attributes
+      orm.save!.tap do
+        clear_cached_response
+        # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#lastModified
+        # TODO perhaps attributes could be lazily fetched
+        @attributes = get_attributes_from_orm(@orm)
+        clear_cached_response
+      end
+    end
+
+    def create_and_fetch_attributes
+        @orm = orm.create
+        # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#created
+        # TODO perhaps attributes could be lazily fetched
+        @attributes = get_attributes_from_orm(@orm)
+        clear_cached_response
+    end
+
+    # TODO this causes slowness because we're losing the cached GET response. However it prevents ETag exceptions caused when a
+    # subnode is added before an update.
+    def clear_cached_response
+      # This strips the current cached response (and ETag) from the current ORM to avoid ETag exceptions on the next update,
+      # since the etag will change if a child node is added.
+      @orm = Ldp::Orm.new @orm.resource.class.new @orm.resource.client, @orm.resource.subject
+    end
+
+
+    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
+
+    module ClassMethods
+      def find(id)
+        resource = Ldp::Resource::RdfSource.new(FedoraLens.connection, id_to_uri(id))
+        raise Ldp::NotFound if resource.new?
+        self.new(resource)
+      end
+
+      def id_to_uri(id)
+        FedoraLens.id_to_uri(id)
+      end
+
+      def uri_to_id(uri)
+        FedoraLens.uri_to_id(uri)
+      end
+
+      def create(data)
+        model = self.new(data)
+        model.save
+        model
+      end
+
+      def orm_to_hash
+        if @orm_to_hash.nil?
+          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)
+        end
+        @orm_to_hash
+      end
+
+      # def has_one(name, scope = nil, options = {})
+      #   ActiveRecord::Associations::Builder::HasOne.build(self, name, scope, options)
+      # end
+    end
+  end
+end
+
+require 'fedora_lens/lenses'
+

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - lib/fedora_lens/attribute_methods/declarations.rb
 - lib/fedora_lens/attribute_methods/read.rb
 - lib/fedora_lens/attribute_methods/write.rb
+- lib/fedora_lens/core.rb
 - lib/fedora_lens/errors.rb
 - lib/fedora_lens/lens.rb
 - lib/fedora_lens/lens_tests.rb