active-triples 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e39f588d57dbf6bf017fd8d89be33cc2614cd11
-  data.tar.gz: 0cc21f34df785724b9551c5365b8c31e5de7cd12
+  metadata.gz: 69f4bbb38bbc80b3dcb2f5250390db3a6519f70a
+  data.tar.gz: 695a3c37c83a8fd57902dd1d444418f637299208
 SHA512:
-  metadata.gz: ad58904cf28803ef6f977792cce6bc8127de400a7b68121e109011e1bb4bde504fe0d56c971fd26ea1bccc444d23894333a24e44ce06a9f3d8c05da0e05ed347
-  data.tar.gz: 3078779a4860330222361efb8e9857f33d71ed76dca1c8934287d13537aa316f71f1bbf060e1a69848d123ea0e0d2b96c4ad84606f358062c9ea5ddcb1fe719c
+  metadata.gz: 6d7e2610c7b7d621d8979ada3384b799dfe4002c62d308416233f15ab05bf3dc09b4f19a621801912d8eec49e3edbb9d6730996aaf03e5082cee90f3731f96ee
+  data.tar.gz: ba886577caa4650341a311a0097489875fb4ef557fc69858c17c8058c749c16a710fad5889f3ee1f9f7f8fd2148583897fdb50516d54efdfdb6d2faf0738af2a

data/lib/active_triples/properties.rb

@@ -53,9 +53,16 @@ module ActiveTriples
       # @param [Hash]  opts for this property, must include a :predicate
       # @yield [index] index sets solr behaviors for the property
       def property(name, opts={}, &block)
+        raise ArgumentError, "#{name} is a keyword and not an acceptable property name." if protected_property_name? name
         reflection = PropertyBuilder.build(self, name, opts, &block)
         Reflection.add_reflection self, name, reflection
       end
+      
+      def protected_property_name?(name)
+        reject = self.instance_methods.map! { |s| s.to_s.gsub(/=$/, '').to_sym }
+        reject -= properties.keys.map { |k| k.to_sym }
+        reject.include? name
+      end
 
       ##
       # Given a property name or a predicate, return the configuration

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/active_triples/properties_spec.rb

@@ -38,6 +38,22 @@ describe ActiveTriples::Properties do
       DummyProperties.property :title, :predicate => RDF::DC.title, :class_name => "FakeClassName"
       expect(DummyProperties.reflect_on_property(:title)[:class_name]).to eq "FakeClassName"
     end
+
+    it 'raises error when defining properties that are already methods' do
+      DummyProperties.send :define_method, :type, lambda { }
+      expect { DummyProperties.property :type, :predicate => RDF::DC.type }.to raise_error ArgumentError
+    end
+
+    it 'raises error when defining properties already have method setters' do
+      DummyProperties.send :define_method, :type=, lambda { }
+      expect { DummyProperties.property :type, :predicate => RDF::DC.type }.to raise_error ArgumentError
+    end
+
+    it 'allows resetting of properties' do
+      DummyProperties.property :title, :predicate => RDF::DC.alternative
+      DummyProperties.property :title, :predicate => RDF::DC.title
+      expect(DummyProperties.reflect_on_property(:title).predicate).to eq RDF::DC.title
+    end
   end
 
   describe '#config_for_term_or_uri' do

data/spec/active_triples/resource_spec.rb

@@ -549,7 +549,7 @@ describe ActiveTriples::Resource do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :name, :predicate => RDF::FOAF.name
+        property :foaf_name, :predicate => RDF::FOAF.name
         property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
         property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
       end
@@ -579,13 +579,13 @@ describe ActiveTriples::Resource do
 
     let (:person1) do
       p = DummyPerson.new
-      p.name = 'Alice'
+      p.foaf_name = 'Alice'
       p
     end
 
     let (:person2) do
       p = DummyPerson.new
-      p.name = 'Bob'
+      p.foaf_name = 'Bob'
       p
     end
 
@@ -614,7 +614,7 @@ END
       document2.creator = person1
       person1.knows = person2
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.name).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foaf_name).to eq ['Bob']
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf