kalimba 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51492726fdd0d0303d00af8376c1bef0af951d48
-  data.tar.gz: c4bdf88223e9efd0591d447a152b9f16896d0626
+  metadata.gz: 7fd069de6d00e1c65056fff0475c77f7fdaee85d
+  data.tar.gz: af303d1b91dec1a12f2d98eb34d5fbd725092460
 SHA512:
-  metadata.gz: 1543ecdd70a064ca87f4328d5e6729297d28cc93174917c2907911512191746b28c0bff95bcff08fe190956522bb6926c515231541e986ce0bc6ccb04af5304e
-  data.tar.gz: 61c0b9a9a146b8da73499ea763b21a02e2405fda113c2dd8ba589479f126d61ea9bffaadda60e17fffe0bf71768732f85a64ddff88b653f86be84ae3278cecc7
+  metadata.gz: 83c57ef31bf5328e4db51c63cfe1536c7c8610603f7b50ebb85be9319f33e6c4d8ed9646a723db97b4020d608770b6440a93d275c07a77cb3897c2146b1435cf
+  data.tar.gz: 386202bcead3ac436ca01dd2a25914a507cb99dcdc6932af5772f0e9e96efe2cfacbe43c49b03f2a9cb6f7167f2dac3c3d5f9bbbb70eaae23306d159c34f7816

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Slava Kravchenko
+Copyright (c) 2012, 2013 Slava Kravchenko
 
 MIT License
 

data/lib/kalimba/reflection.rb

@@ -9,8 +9,8 @@ module Kalimba
       @reflections ||= {}
     end
 
-    def create_reflection(name, params = {})
-      reflections[name] = AssociationReflection.new(name, {class_name: params[:datatype]})
+    def create_reflection(name, klass)
+      reflections[name] = AssociationReflection.new(name, {class_name: klass})
     end
 
     def reflect_on_association(association)

data/lib/kalimba/resource.rb

@@ -96,24 +96,18 @@ module Kalimba
         name = name.to_s
 
         params[:predicate] = URI(params[:predicate])
-        association = Kalimba::Resource.from_datatype(params[:datatype])
-        if association
-          params[:datatype] = association.type
-          class_eval <<-HERE, __FILE__, __LINE__
-            def #{name}_id
-              self.#{name}.try(:id)
-            end
-
-            def #{name}_id=(value)
-              self.#{name} = value.blank? ? nil : #{association}.for(value)
-            end
-          HERE
+        association_class = Kalimba::Resource.from_datatype(params[:datatype])
+        if association_class
+          params[:datatype] = association_class
+          if params[:collection]
+            define_collection(name, association_class)
+          else
+            define_resource(name, association_class)
+          end
         else
           params[:datatype] = URI(params[:datatype])
         end
 
-        define_collection(name, params) if params[:collection]
-
         self.properties[name] = params
 
         define_attribute_method name if self.is_a?(Class)
@@ -152,6 +146,9 @@ module Kalimba
       # @example
       #   has_many :duties, :predicate => "http://works.com#duty", :datatype => NS::XMLSchema["string"]
       #
+      # Note however, that if given datatype does not refer to a Kalimba::Resource class,
+      # no reflections and `_ids` and `_ids=` accessors will be created in that case.
+      #
       # @param (see #property)
       def has_many(name, params = {})
         property name, params.merge(:collection => true)
@@ -162,6 +159,8 @@ module Kalimba
       # @param [String, URI, Symbol] uri
       # @return [Kalimba::Resource]
       def from_datatype(datatype)
+        return datatype if datatype.is_a?(Class) && datatype.ancestors.include?(Kalimba::Resource)
+
         datatype =
           case datatype
           when URI
@@ -192,8 +191,21 @@ module Kalimba
         child.properties = properties.dup
       end
 
-      def define_collection(name, params)
-        create_reflection(name, params)
+      def define_resource(name, klass)
+        class_eval <<-HERE, __FILE__, __LINE__
+          def #{name}_id
+            self.#{name}.try(:id)
+          end
+
+          def #{name}_id=(value)
+            self.#{name} = value.blank? ? nil : #{klass}.for(value)
+          end
+        HERE
+      end
+
+      def define_collection(name, klass)
+        # Rails reflections require symbolized names
+        create_reflection(name.to_sym, klass)
 
         class_eval <<-HERE, __FILE__, __LINE__
           def #{name.singularize}_ids
@@ -258,6 +270,19 @@ module Kalimba
       subject
     end
 
+    # Resource equality
+    #
+    # Two Kalimba resources are equal if their subjects are equal.
+    # We do not tell between persisted or not persisted RDF resources.
+    # However, "new" resources (those without a subject) are never equal.
+    #
+    # @param [Kalimba::Resource] other other Kalimba::Resource
+    # @return [Boolean]
+    def eql?(other)
+      other.is_a?(Kalimba::Resource) && !subject.nil? && other.subject == subject
+    end
+    alias == eql?
+
     private
 
     include Kalimba::Callbacks

data/lib/kalimba/version.rb

@@ -1,3 +1,3 @@
 module Kalimba
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/kalimba/persistence_spec.rb

@@ -260,7 +260,7 @@ describe Kalimba::Persistence do
         end
       end
 
-      context "to collections" do
+      context "to collections of non-Kalimba resources" do
         before { person.duties = %w(building designing) }
 
         context "when saved" do
@@ -269,6 +269,27 @@ describe Kalimba::Persistence do
           it "should be added statements with changed attributes (type + duties*2)" do
             expect(Kalimba.repository.size).to eql 3
           end
+
+          it "should include the collection" do
+            person.reload
+            expect(person.duties).to eql %w(building designing)
+          end
+        end
+      end
+
+      context "to collections of Kalimba resources" do
+        before do
+          @berk = Engineer.for("Berk")
+          person.coworkers = [@berk]
+        end
+
+        context "when saved" do
+          before { person.save }
+
+          it "should retain the list of coworkers" do
+            person.reload
+            expect(person.coworkers).to eql [@berk]
+          end
         end
       end
     end

data/spec/lib/kalimba/reflection_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe "reflection" do
+  before :all do
+    class ReflectionTestOilRig < Kalimba::Resource
+      type "http://schema.org/ReflectionTestOilRig"
+      base_uri "http://example.org/reflection_oil_rigs"
+
+      has_many :neighbours, :predicate => "http://example.org/reflection_oil_rigs", :datatype => :ReflectionTestOilRig
+      has_many :saboteurs, :predicate => "http://example.org/reflection_saboteur", :datatype => "http://schema.org/ReflectionTestSaboteur"
+    end
+  end
+
+  subject { ReflectionTestOilRig.reflections }
+
+  context "for a non-Kalimba resource" do
+    it { should_not have_key :saboteurs }
+  end
+
+  context "for a Kalimba::Resource association" do
+    it { should have_key :neighbours }
+
+    context ":neighbours" do
+      subject { ReflectionTestOilRig.reflect_on_association(:neighbours) }
+
+      it "should have proper accessors" do
+        expect(subject.macro).to eql :has_many
+        expect(subject.name).to eql :neighbours
+        expect(subject.klass).to eql ReflectionTestOilRig
+        expect(subject.class_name).to eql "ReflectionTestOilRig"
+      end
+    end
+  end
+end

data/spec/lib/kalimba/resource_spec.rb

@@ -39,6 +39,8 @@ describe Kalimba::Resource do
 
       it { should respond_to :attributes }
 
+      it { should_not eql ResourceTestPerson.new }
+
       context "created via 'for'" do
         subject { ResourceTestPerson.for "charlie" }
 
@@ -47,6 +49,8 @@ describe Kalimba::Resource do
         it "should set subject to the given URI" do
           expect(subject.subject).to eql URI("http://example.org/people/#charlie")
         end
+
+        it { should eql ResourceTestPerson.for("charlie") }
       end
 
       describe "serialization" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalimba
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Slava Kravchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -74,13 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- kalimba-redlander.gemspec
-- kalimba.gemspec
 - lib/kalimba.rb
 - lib/kalimba/attribute_assignment.rb
 - lib/kalimba/callbacks.rb
@@ -96,12 +92,14 @@ files:
 - spec/lib/kalimba/attributes_spec.rb
 - spec/lib/kalimba/callbacks_spec.rb
 - spec/lib/kalimba/persistence_spec.rb
+- spec/lib/kalimba/reflection_spec.rb
 - spec/lib/kalimba/resource_spec.rb
 - spec/lib/kalimba/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/resource_ext.rb
 homepage: https://github.com/cordawyn/kalimba
-licenses: []
+licenses:
+- The MIT License (MIT)
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -119,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Kalimba provides ActiveRecord-like capabilities for RDF resources.
@@ -127,6 +125,7 @@ test_files:
 - spec/lib/kalimba/attributes_spec.rb
 - spec/lib/kalimba/callbacks_spec.rb
 - spec/lib/kalimba/persistence_spec.rb
+- spec/lib/kalimba/reflection_spec.rb
 - spec/lib/kalimba/resource_spec.rb
 - spec/lib/kalimba/validations_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.rspec
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-TAGS
-*~
-.*~
-bin/

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec name: "kalimba"
-gemspec name: "kalimba-redlander"
-
-gem "rake"

data/kalimba-redlander.gemspec

@@ -1,19 +0,0 @@
-require File.expand_path('../lib/kalimba/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.name          = "kalimba-redlander"
-  gem.version       = Kalimba::VERSION
-  gem.authors       = ["Slava Kravchenko"]
-  gem.email         = ["slava.kravchenko@gmail.com"]
-  gem.description   = %q{Redlander adapter for Kalimba. It provides the RDF storage backend for Kalimba.}
-  gem.summary       = %q{Redlander adapter for Kalimba}
-  gem.homepage      = "https://github.com/cordawyn/kalimba-redlander"
-
-  gem.files         = ["lib/kalimba/persistence/redlander.rb"]
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-
-  gem.add_runtime_dependency "kalimba"
-  gem.add_runtime_dependency "redlander", "~> 0.6.0"
-end

data/kalimba.gemspec

@@ -1,22 +0,0 @@
-require File.expand_path('../lib/kalimba/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Slava Kravchenko"]
-  gem.email         = ["slava.kravchenko@gmail.com"]
-  gem.description   = %q{ActiveModel-based framework, which allows the developer to combine RDF resources into ActiveRecord-like models.}
-  gem.summary       = %q{Kalimba provides ActiveRecord-like capabilities for RDF resources.}
-  gem.homepage      = "https://github.com/cordawyn/kalimba"
-
-  gem.files         = `git ls-files`.split($\) - ["lib/kalimba/persistence/redlander.rb"]
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "kalimba"
-  gem.require_paths = ["lib"]
-  gem.version       = Kalimba::VERSION
-
-  gem.add_runtime_dependency "activemodel", "~> 3.2"
-  gem.add_runtime_dependency "activesupport", "~> 3.2"
-
-  gem.add_development_dependency "rspec", "~> 2.11.0"
-  gem.add_development_dependency "kalimba-redlander"
-end