dbd_data_engine 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60772142b222f4d7223664c57510e4c2744eda58
-  data.tar.gz: 585c9382c874255c252bf82b97378e6153cbd52d
+  metadata.gz: b67549dd442c942904057502724c772be382b9d9
+  data.tar.gz: 7e610615d7d3686fab21c79387dfe520420e9d1a
 SHA512:
-  metadata.gz: 4d50fa907a98862659481d38872c7887ab07766ada3dad65f79d24b0fa974784405ae759dc22900e0ea061175326df341b6e416d4a966e96758eb984fbdba39e
-  data.tar.gz: e5e67b11411b7a42181b1cd882a4790bacf570643530760b757a9ee76f58a4d497a7bcb38600f1cb4844b463912ee4b53ab29540b8e7805c53e5ae5004d1f73b
+  metadata.gz: 8bac716118f130687c49d849f3495e442d55232bfd48ed0465adf350413c8575f8ed90c19adba43ef768d72dc98d44fbb631835d620a7355f4d1059db7b14356
+  data.tar.gz: 124114be5f6e8cfcb5e8e1d9a283939f59f1ed55be40fdf3afaadc96fdc2101c3ce9a1b63a15d21bb11c9f120f1dfe61d80fb138365c0f88aac538464c2d31a9

data/HISTORY.txt

@@ -50,3 +50,8 @@
 
 * lock Capybara config.ignore_hidden_elements = false because this
   now failed to find hidden fields
+
+0.0.10 (2014-02-09)
+======
+
+* Now using the new used schema predicates

data/app/controllers/dbd_data_engine/resources_controller.rb

@@ -9,7 +9,7 @@ module DbdDataEngine
 
     def new
       @contexts = ['public today', 'personal today', 'business today']
-      @predicates = predicates_for_new
+      @predicates = Resource.used_predicates
     end
 
     def create
@@ -54,8 +54,5 @@ module DbdDataEngine
       end
     end
 
-    def predicates_for_new
-      ['schema:givenName','schema:familyName']
-    end
   end
 end

data/app/models/dbd_data_engine/context.rb

@@ -1,6 +1,8 @@
 module DbdDataEngine
   class Context
 
+    extend ::DbdDataEngine::ResourceSelectors
+
     def self.predicates
       resources = ::DbdOnto::Context.new.resources
       predicate_defining_resources = select_with_defines_predicate(resources)
@@ -98,14 +100,6 @@ module DbdDataEngine
        ['dcterms:created','s',today.to_s]]
     end
 
-    # TODO implement some of these methods on Dbd gem to clean-up
-
-    def self.select_with_defines_predicate(resources)
-      resources.select do |resource|
-        single_fact_on_predicate(resource, 'meta:defines_predicate')
-      end
-    end
-
     def self.make_predicate_label_hash(resources)
       resources.map do |resource|
         predicate = single_fact_on_predicate(resource, 'meta:defines_predicate').object
@@ -115,10 +109,5 @@ module DbdDataEngine
       end
     end
 
-    def self.single_fact_on_predicate(resource, predicate)
-      resource.select do |fact|
-        fact.predicate == predicate
-      end.single
-    end
   end
 end

data/app/models/dbd_data_engine/resource.rb

@@ -0,0 +1,28 @@
+module DbdDataEngine
+  class Resource
+
+    extend ::DbdDataEngine::ResourceSelectors
+
+    def self.used_predicates
+      resources = ::DbdOnto::Schema.new.resources
+      predicate_defining_resources = select_with_defines_predicate(resources)
+      used_predicate_defining_resources = select_used(predicate_defining_resources)
+      extract_defines_predicate_object(used_predicate_defining_resources)
+    end
+
+  private
+
+    def self.select_used(resources)
+      resources.select do |resource|
+        single_fact_on_predicate(resource, 'meta:predicate_used')
+      end
+    end
+
+    def self.extract_defines_predicate_object(resources)
+      resources.map do |resource|
+        single_fact_on_predicate(resource, 'meta:defines_predicate').object
+      end
+    end
+
+  end
+end

data/app/views/dbd_data_engine/resources/new.html.haml

@@ -3,7 +3,7 @@
 = form_tag('/data/resources', method: :post) do # engine controller route not loaded in view tests
   %p
     =label_tag('Context')
-    =select_tag('context', options_for_select(@contexts)) #@contexts))
+    =select_tag('context', options_for_select(@contexts))
   %table
     %tr
       %th predicate

data/dbd_data_engine.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '>= 4.0.2'
   s.add_dependency 'haml'
   s.add_dependency 'dbd', '~> 0.1.3'
-  s.add_dependency 'dbd_onto', '~> 0.0.12'
+  s.add_dependency 'dbd_onto', '~> 0.0.13'
 
   s.add_development_dependency 'haml-rails'
   s.add_development_dependency 'rspec-rails'

data/lib/dbd_data_engine.rb

@@ -1,4 +1,5 @@
 require 'dbd_data_engine/engine'
+require 'dbd_data_engine/resource_selectors'
 require 'haml'
 require 'dbd'
 require 'dbd_onto'

data/lib/dbd_data_engine/resource_selectors.rb

@@ -0,0 +1,19 @@
+module DbdDataEngine
+  module ResourceSelectors
+
+    # TODO implement some of these methods on Dbd gem to clean-up
+
+    def select_with_defines_predicate(resources)
+      resources.select do |resource|
+        single_fact_on_predicate(resource, 'meta:defines_predicate')
+      end
+    end
+
+    def single_fact_on_predicate(resource, predicate)
+      resource.select do |fact|
+        fact.predicate == predicate
+      end.single
+    end
+
+  end
+end

data/lib/dbd_data_engine/version.rb

@@ -1,3 +1,3 @@
 module DbdDataEngine
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/features/resources/new_spec.rb

@@ -20,8 +20,16 @@ module DbdDataEngine
             expect(page).to have_css('h1', text: 'Create a new resource')
           end
 
+          it 'has the schema:about option' do
+            expect(page).to have_css('select#predicate_ > option[value="schema:about"]')
+          end
+
           it 'has a select box array with schema:givenName as option' do
-            expect(page).to have_select('predicate[]', options: ['schema:givenName','schema:familyName'])
+            expect(page).to have_css('select#predicate_ > option[value="schema:givenName"]')
+          end
+
+          it 'has a select box array with schema:familyName as option' do
+            expect(page).to have_css('select#predicate_ > option[value="schema:familyName"]')
           end
 
           it 'has a field array' do
@@ -37,6 +45,10 @@ module DbdDataEngine
           it 'has a select box for the context' do
             expect(page).to have_select('context', [])
           end
+
+          it 'has an option "public today"' do
+            expect(page).to have_css('select#context > option[value="public today"]')
+          end
         end
       end
     end

data/spec/models/dbd_data_engine/context/defaults_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module DbdDataEngine
   describe Context do
 
-    def assert_object(context, object)
+    def assert_context_has_object(context, object)
       context.select{ |cf| cf.object.to_s == object }.size.should == 1
     end
 
@@ -20,17 +20,17 @@ module DbdDataEngine
       context 'default_from_params' do
         it 'returns public_today' do
           context = described_class.default_from_params('public today', current_graph)
-          assert_object(context, 'public')
+          assert_context_has_object(context, 'public')
         end
 
         it 'returns personal_today' do
           context = described_class.default_from_params('personal today', current_graph)
-          assert_object(context, 'personal')
+          assert_context_has_object(context, 'personal')
         end
 
         it 'returns business_today' do
           context = described_class.default_from_params('business today', current_graph)
-          assert_object(context, 'business')
+          assert_context_has_object(context, 'business')
         end
 
         it 'raises for inexisting param' do
@@ -51,7 +51,7 @@ module DbdDataEngine
         end
 
         it 'has a public object' do
-          assert_object(context, 'public')
+          assert_context_has_object(context, 'public')
         end
       end
 
@@ -68,7 +68,7 @@ module DbdDataEngine
         end
 
         it 'has a personal object' do
-          assert_object(context, 'personal')
+          assert_context_has_object(context, 'personal')
         end
       end
 
@@ -85,7 +85,7 @@ module DbdDataEngine
         end
 
         it 'has a business object' do
-          assert_object(context, 'business')
+          assert_context_has_object(context, 'business')
         end
       end
     end

data/spec/models/dbd_data_engine/context/predicates_spec.rb

@@ -3,21 +3,23 @@ require 'spec_helper'
 module DbdDataEngine
   describe Context do
 
-    let(:context_predicates) {
+    let(:context_predicates) do
       ['context:visibility',
        'context:encryption',
        'context:license',
        'dc:source',
        'dc:creator',
-       'dcterms:created']}
+       'dcterms:created']
+    end
 
-    let(:context_labels) {
+    let(:context_labels) do
       ['Visibility',
        'Encryption',
        'License',
        'Source',
        'Creator',
-       'Created']}
+       'Created']
+    end
 
     it 'has all the context predicates' do
       described_class.predicates.map{ |p| p[:predicate] }.should == context_predicates

data/spec/models/dbd_data_engine/resource/used_predicates_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+module DbdDataEngine
+  describe Resource do
+    describe 'used_predicates' do
+
+      let(:used_predicates) do
+        ['schema:about', 'schema:familyName', 'schema:givenName']
+      end
+
+      it 'has all the used predicates' do
+        described_class.used_predicates.should == used_predicates
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd_data_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,7 @@ files:
 - app/controllers/dbd_data_engine/resources_controller.rb
 - app/helpers/dbd_data_engine/application_helper.rb
 - app/models/dbd_data_engine/context.rb
+- app/models/dbd_data_engine/resource.rb
 - app/presenters/context_presenter.rb
 - app/presenters/fact_with_context.rb
 - app/presenters/resource_with_contexts.rb
@@ -201,6 +202,7 @@ files:
 - dbd_data_engine.gemspec
 - lib/dbd_data_engine.rb
 - lib/dbd_data_engine/engine.rb
+- lib/dbd_data_engine/resource_selectors.rb
 - lib/dbd_data_engine/version.rb
 - lib/tasks/dbd_data_engine_tasks.rake
 - spec/controllers/nothing_here_tests_in_features_and_requests
@@ -249,6 +251,7 @@ files:
 - spec/features/resources/new_spec.rb
 - spec/models/dbd_data_engine/context/defaults_spec.rb
 - spec/models/dbd_data_engine/context/predicates_spec.rb
+- spec/models/dbd_data_engine/resource/used_predicates_spec.rb
 - spec/presenters/context_presenter/context_summary_spec.rb
 - spec/presenters/fact_with_context/new_spec.rb
 - spec/presenters/resource_with_contexts/new_spec.rb
@@ -337,6 +340,7 @@ test_files:
 - spec/features/resources/new_spec.rb
 - spec/models/dbd_data_engine/context/defaults_spec.rb
 - spec/models/dbd_data_engine/context/predicates_spec.rb
+- spec/models/dbd_data_engine/resource/used_predicates_spec.rb
 - spec/presenters/context_presenter/context_summary_spec.rb
 - spec/presenters/fact_with_context/new_spec.rb
 - spec/presenters/resource_with_contexts/new_spec.rb