active_triples-local_name 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OThlYTNlODZlOGMwNTBiZGE0ZjYwOWZiNDE1Njc2NjViNjljNjgyNw==
-  data.tar.gz: !binary |-
-    MGRlMjgyMmE1ZDMxOGRmN2ZjODA2MmNlYTcwYTBlN2FjMjc3NjFmNw==
+SHA1:
+  metadata.gz: 167a82e0b5dcf29e3580f9f684b61fcff31aef36
+  data.tar.gz: f0a6da5bf67290999379b9d458593db5adcc7389
 SHA512:
-  metadata.gz: !binary |-
-    NmY4NjEzZDZmZTM0OWRjNGEwMTZmZTc2NzQ2YTMzZDAwZjYzOWFmZDljMWMw
-    ZDAwNWM0OGQ4ODU4MWVjNmRmNzk1NTU4MmJkNTVjOWRiM2VmMDdkMjE5ODRk
-    MGI1ODAxYmE2NDE3YTQ4YTRjZjk2YTNkNzJkNjVlYzllZGY4YzE=
-  data.tar.gz: !binary |-
-    Mjc1ZTZkZGQxYTQyZTk2ZTEyMzBmMGI1NTA2ZmRjNTM1NDZkYjIxZDIzYjIy
-    ODg2ZjgzYmYwOGEyZTRiN2UxZGVhYWI3ODg4YTFjOWFkNmY2MzBhOTllOTRl
-    MWRlYzQwNTUwMmUxOWJkNWFmZWQyZjliYmM1YWU0NGQwMWM1MGQ=
+  metadata.gz: ed11e4fa67b948fb424a7995025228ee3046d1dcbd06a0a4db12d6f3a45bbb038799e937000604b2ca97a819ca7f3e56d2d7bb54eeab051fe28ec24e31f8dc8f
+  data.tar.gz: 05d83f63cd81934c0d7958076db00cd1cb7288bd6f0ecddb9ce03acda4cf7dadeee4fd50a126b490493e7e929e62f09478aeca3f5d9325390f79b8ce702c349c

data/.travis.yml

@@ -4,9 +4,11 @@ script: "bundle exec rspec spec"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 2.1.6
+  - 2.2.2
+  - ruby-head
   - jruby-19mode
 matrix:
   allow_failures:
-      - rvm: jruby-19mode
+    - rvm: ruby-head
+    - rvm: jruby-19mode

data/AUTHORS

@@ -1,2 +1 @@
-* Tom Johnson (thomas.johnson@oregonstate.edu)
-* Trey Terrell
+* E. Lynette Rayle (elr37@cornell.edu)

data/README.md

@@ -4,8 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/ActiveTriples/active_triples-local_name/badge.png?branch=master)](https://coveralls.io/r/ActiveTriples/active_triples-local_name?branch=master)
 [![Gem Version](https://badge.fury.io/rb/active_triples-local_name.svg)](http://badge.fury.io/rb/active_triples-local_name)
 
-Provides utilities for working with local names under the [ActiveTriples](https://github.com/ActiveTriples/ActiveTriples) 
-framework.  Includes a default implementation of a local name minter.
+Provides utilities for working with local names under the [ActiveTriples](https://github.com/ActiveTriples/ActiveTriples) framework.  Includes a default implementation of a local name minter.
 
 
 ## Installation
@@ -60,15 +59,11 @@ localname = ActiveTriples::LocalName::Minter.generate_local_name(
 
 Parameter NOTES:
 * for_class = DummyResourceWithBaseURI - resource class must have base_uri configured
-* max_tries = 10 - If using default minter, it should easily find an available local name in 10 tries.  
-  If your minter algorithm gets lots of clashes with existing URIs and max_tries is set high, you may 
-  run into performance issues.
+* max_tries = 10 - If using default minter, it should easily find an available local name in 10 tries.
+  If your minter algorithm gets lots of clashes with existing URIs and max_tries is set high, you may run into performance issues.
 * minter_args (optional) = {:prefix=>'d'} - The default minter takes a single hash argument.  You can
   define minters that take no arguments, multiple arguments, or a multiple item hash argument.
-* minter_block = nil - When minter_block is not passed in, the default minter algorithm, which produces
-  a UUID, will be used.  Best practice is to start local names with an alpha character.  UUIDs generate 
-  with either an alpha or numeric as the first character. Passing in a prefix of 'd' forces the local 
-  name to start with the character 'd'.
+* minter_block = nil - When minter_block is not passed in, the default minter algorithm, which produces a UUID, will be used.  Best practice is to start local names with an alpha character.  UUIDs generate with either an alpha or numeric as the first character. Passing in a prefix of 'd' forces the local name to start with the character 'd'.
 
 
 #### Example: Passing in a block as minter

data/active_triples-local_name.gemspec

@@ -14,11 +14,13 @@ Gem::Specification.new do |s|
   s.license     = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency('active-triples', '~> 0.5')
+  s.add_dependency('active-triples')
 
-  s.add_dependency('deprecation', '~> 0.1')
-  s.add_dependency('activesupport', '>= 3.0.0')
+  s.add_dependency('deprecation')
+  s.add_dependency('activesupport')
 
+  s.add_development_dependency('pry')
+  # s.add_development_dependency('pry-byebug')  # uncomment for ruby >= 2.0
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec')
   s.add_development_dependency('coveralls')

data/lib/active_triples/local_name.rb

@@ -9,19 +9,8 @@ module ActiveTriples
       autoload :Minter
     end
 
-    def self.class_from_string(class_name, container_class=Kernel)
-      container_class = container_class.name if container_class.is_a? Module
-      container_parts = container_class.split('::')
-      (container_parts + class_name.split('::')).flatten.inject(Kernel) do |mod, class_name|
-        if mod == Kernel
-          Object.const_get(class_name)
-        elsif mod.const_defined? class_name.to_sym
-          mod.const_get(class_name)
-        else
-          container_parts.pop
-          class_from_string(class_name, container_parts.join('::'))
-        end
-      end
+    def self.post_ActiveTriples_0_7?
+      ActiveTriples.constants.include?(:RDFSource)
     end
   end
 end

data/lib/active_triples/local_name/minter.rb

@@ -10,7 +10,7 @@ module ActiveTriples
       # Generate a random localname that combined with a class' base_uri does not already exist in
       # registered triplestores.
       #
-      # @param [Class] the class inheriting from <tt>ActiveTriples::Reource</tt> whose configuration
+      # @param [Class] the class inheriting from <tt>ActiveTriples::Reource</tt> (ActiveTriples < 0.7) or including <tt>ActiveTriples::RDFSource</tt> (ActiveTriples >= 0.7) whose configuration
       #   is used to generate the full URI for testing for uniqueness of the generated local name
       # @param [Integer] the maximum number of attempts to make a unique local name
       # @yieldparam the arguments to pass to the minter block (optional)
@@ -21,7 +21,7 @@ module ActiveTriples
       # @return [String] the generated local name
       #
       # @raise [ArgumentError] if maximum allowed tries is less than 0
-      # @raise [ArgumentError] if for_class does not inherit from ActiveTriples::Resources
+      # @raise [ArgumentError] if for_class does not inherit from ActiveTriples::Resources (ActiveTriples < 0.7) or include ActiveTriples:RDFSource (ActiveTriples >= 0.7)
       # @raise [ArgumentError] if minter_block is not a block (does not respond to call)
       # @raise [Exception] if for_class does not have base_uri configured
       # @raise [Exception] if an available local name is not found in the maximum allowed tries.
@@ -35,7 +35,14 @@ module ActiveTriples
       def self.generate_local_name(for_class, max_tries=10, *minter_args, &minter_block)
         raise ArgumentError, 'Argument max_tries must be >= 1 if passed in' if     max_tries    <= 0
 
-        raise ArgumentError, 'Argument for_class must inherit from ActiveTriples::Resource' unless for_class < ActiveTriples::Resource
+        if( ActiveTriples::LocalName.post_ActiveTriples_0_7? )  # Supports ActiveTriples >= 0.7
+          raise ArgumentError, 'Argument for_class must inherit from ActiveTriples::Resource or include module ActiveTriples::RDFSource' unless
+              ( for_class < ActiveTriples::Resource || for_class.included_modules.include?(ActiveTriples::RDFSource) )
+        else                                                     # Supports ActiveTriples < 0.7
+          raise ArgumentError, 'Argument for_class must inherit from ActiveTriples::Resource' unless
+              ( for_class < ActiveTriples::Resource )
+        end
+
         raise 'Requires base_uri to be defined in for_class.' unless for_class.base_uri
 
         raise ArgumentError, 'Invalid minter_block.' if minter_block && !minter_block.respond_to?(:call)

data/lib/active_triples/local_name/version.rb

@@ -1,5 +1,5 @@
 module ActiveTriples
   module LocalName
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/active_triples/local_name/minter_spec.rb

@@ -109,11 +109,20 @@ describe ActiveTriples::LocalName::Minter do
         end
 
         it "should raise error" do
+          if( ActiveTriples::LocalName.post_ActiveTriples_0_7? )  # for ActiveTriples >= 0.7
+            err_msg = 'Argument for_class must inherit from ActiveTriples::Resource or include module ActiveTriples::RDFSource'
+          else                                                     # for ActiveTriples < 0.7
+            err_msg = 'Argument for_class must inherit from ActiveTriples::Resource'
+          end
           expect{ ActiveTriples::LocalName::Minter.generate_local_name(DummyNonResource) }.
-              to raise_error(ArgumentError, 'Argument for_class must inherit from ActiveTriples::Resource')
+              to raise_error(ArgumentError, err_msg)
         end
-      end
 
+        it "should not raise error when inheriting from ActiveTriples::Resource" do
+          expect{ ActiveTriples::LocalName::Minter.generate_local_name(DummyResourceWithBaseURI) }.
+              not_to raise_error
+        end
+      end
 
       context "and class doesn't have base_uri defined" do
         it "should raise error" do
@@ -436,4 +445,31 @@ describe ActiveTriples::LocalName::Minter do
       end
     end
   end
+
+  describe "test validation when ActiveTriples >= 0.7" do
+    before do
+      if( ActiveTriples::LocalName.post_ActiveTriples_0_7? )  # Check that ActiveTriples >= 0.7
+        class DummyResourceInclude
+          include  ActiveTriples::RDFSource
+          configure :base_uri => "http://example.org",
+                    :type => RDF::URI('http://example.org/SomeClass')
+          property :title, :predicate => RDF::DC.title
+        end
+      end
+    end
+    after do
+      if( ActiveTriples::LocalName.post_ActiveTriples_0_7? )  # Check that ActiveTriples >= 0.7
+        Object.send(:remove_const, "DummyResourceInclude") if Object
+      end
+    end
+
+    it "should not raise error when including from ActiveTriples::RDFSource" do
+      unless( ActiveTriples::LocalName.post_ActiveTriples_0_7? )  # Supports ActiveTriples >= 0.7
+        skip ('Cannot test include ActiveTriples::RDFSource when ActiveTriples < 0.7 installed')
+      else
+        expect{ ActiveTriples::LocalName::Minter.generate_local_name(DummyResourceInclude) }.
+          not_to raise_error
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ Bundler.setup
 
 require 'active_triples/local_name'
 require 'active_triples'
-
+require 'pry' unless ENV['CI']
 
 Dir['./spec/support/**/*.rb'].each { |f| require f }
 

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: active_triples-local_name
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-triples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rdoc
   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: rspec
   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: coveralls
   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: guard-rspec
   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'
 description: active_triples-local_name provides a standard interface and default implementation
@@ -117,9 +131,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - Guardfile
@@ -141,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Local name minter for ActiveTriples based resources.