dbd_data_engine 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27625863170f3bc43c1f435b9f3fea611111a9ca
-  data.tar.gz: 4f4deb4f6e84d1a7f7337652bf81a95f70d84034
+  metadata.gz: 82f85724f9a57475c424c42dac21fe88581b5bd6
+  data.tar.gz: d9c19869fa7dcc87a4d0e8c838bd772770109607
 SHA512:
-  metadata.gz: 3387996a56ed38ede62ce254d82fd0cff87145bdeab1510a87cb081df59f80a244e1180d66e8e726cda6fd49f0891cf9d6633532e8e4f10a2d41b42b3134cd13
-  data.tar.gz: 7456a2ca96b4bdc783d1e6e0e162dc94eaf095198158d51eba5c06fa248fd7703897648d866e6027044b1437b7c0e605090d3d3b40808a2ee0269a52f0ff91a5
+  metadata.gz: df2e89cf55cd92187eb6fde6e4271eb5b654fbdffcf339aaa97922b202f2b1c3b0c2ca1585edfec549464a6e14447ebbd9758234f468d3dfe16f77f90cfe6efa
+  data.tar.gz: a9db5852d4904c510126e42a54b6045958aca60353046fc3cac15e59e18ed0bdd9c1a965ca2682968176fb8b79d301c0d134ba9c73495ce52ae03905850b6719

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+# gem 'dbd', '>= 0.0.18', :path => '../dbd'

data/Guardfile

@@ -6,11 +6,12 @@ guard 'rspec', :all_on_start => true, :all_after_pass => true do
   # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/models/(.*)\.rb$})                    { |m| "spec/models/#{m[1]}" }
   watch(%r{^app/controllers/dbd_data_engine/(.+)_(controller)\.rb$})  do |m|
     ["spec/routing/#{m[1]}_routing_spec.rb",
      "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",
-     "spec/features/#{m[1]}_spec.rb",
-     "spec/requests/#{m[1]}_spec.rb"]
+     "spec/features/#{m[1]}",
+     "spec/requests/#{m[1]}"]
   end
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }

data/HISTORY.txt

@@ -19,3 +19,10 @@
 =====
 
 * force dbd >= 0.0.17 (uses neography 1.1.3 that fixes the rubyzip issue)
+
+0.0.5 (2013-09-02)
+=====
+
+* add a naive DbdDataEngine::Context model
+* add a naive ContextsController
+* it takes the predicates for the "new" screen from DbdOnto::Context

data/app/controllers/dbd_data_engine/contexts_controller.rb

@@ -0,0 +1,37 @@
+require_dependency "dbd_data_engine/application_controller"
+
+module DbdDataEngine
+  class ContextsController < ApplicationController
+    def index
+      graph = Dbd::Graph.new
+      graph = graph.from_unsorted_CSV_file(filename)
+      @contexts = graph.subjects.map{ |s| graph.by_subject(s) }
+    end
+
+    def new
+      @predicates = Context.predicates
+    end
+
+    def create
+      graph = Dbd::Graph.new
+      @context = Dbd::Context.new()
+      [params[:predicate], params[:object]].transpose.each do |predicate, object|
+        context_fact = Dbd::ContextFact.new(predicate: predicate,
+                                            object:    object)
+        @context << context_fact
+      end
+      graph << @context
+      new_data = graph.to_CSV
+      File.open(filename, 'a') do |f|
+        f.syswrite new_data
+      end
+    end
+
+  private
+
+    def filename
+      DbdDataEngine.default_CSV_location
+    end
+
+  end
+end

data/app/controllers/dbd_data_engine/resources_controller.rb

@@ -3,6 +3,9 @@ require_dependency "dbd_data_engine/application_controller"
 module DbdDataEngine
   class ResourcesController < ApplicationController
     def index
+      graph = Dbd::Graph.new
+      graph = graph.from_unsorted_CSV_file(filename)
+      @resources = graph.subjects.map{ |s| graph.by_subject(s) }
     end
 
     def new
@@ -13,8 +16,8 @@ module DbdDataEngine
       graph = Dbd::Graph.new
       @resource = Dbd::Resource.new(context_subject: Dbd::Context.new_subject)
       [params[:predicate], params[:object]].transpose.each do |predicate, object|
-        fact = Dbd::Fact.new({predicate: predicate,
-                              object:    object})
+        fact = Dbd::Fact.new(predicate: predicate,
+                             object:    object)
         @resource << fact
       end
       graph << @resource

data/app/models/dbd_data_engine/context.rb

@@ -0,0 +1,13 @@
+module DbdDataEngine
+  class Context
+    def self.predicates
+      ::DbdOnto::Context.new.
+        select do |fact|
+          fact.predicate == 'meta:defines_predicate'
+        end.
+        map do |fact|
+          fact.object
+        end
+    end
+  end
+end

data/app/views/dbd_data_engine/contexts/_context.html.haml

@@ -0,0 +1 @@
+%table= render partial: 'context_fact', collection: context

data/app/views/dbd_data_engine/contexts/_context_fact.html.haml

@@ -0,0 +1,3 @@
+%tr
+  %td= context_fact.predicate
+  %td= context_fact.object

data/app/views/dbd_data_engine/contexts/create.html.haml

@@ -0,0 +1,9 @@
+%h2 New context was created
+
+%p content is:
+%table
+  %tr
+    %th predicate
+    %th object
+  =render :partial => 'context_fact', collection: @context.to_a
+

data/app/views/dbd_data_engine/contexts/index.html.haml

@@ -0,0 +1,4 @@
+%h1 Contexts#index
+
+- @contexts.each do |context|
+  = render partial: 'context', object: context

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

@@ -0,0 +1,13 @@
+%h1 Create a new context
+
+= form_tag('/data/contexts', method: :post) do # engine controller route not loaded in view tests
+  %table
+    %tr
+      %th predicate
+      %th object
+    - @predicates.each do |predicate|
+      %tr
+        %td= text_field_tag('predicate[]', predicate)
+        %td= text_field_tag('object[]')
+
+  %p= submit_tag('Submit')

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

@@ -0,0 +1 @@
+%table= render partial: 'fact', collection: resource

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

@@ -1,2 +1,4 @@
 %h1 Resources#index
-%p Find me in app/views/dbd_data_engine/resources/index.html.haml
+
+- @resources.each do |resource|
+  = render partial: 'resource', object: resource

data/config/routes.rb

@@ -2,5 +2,6 @@ DbdDataEngine::Engine.routes.draw do
   resources 'data', only: [:index]
   scope 'data' do
     resources 'resources', only: [:index, :new, :create]
+    resources 'contexts', only: [:index, :new, :create]
   end
 end

data/dbd_data_engine.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_dependency 'rails', '>= 4.0.0'
   s.add_dependency 'haml'
-  s.add_dependency 'dbd', '>= 0.0.17'
-  s.add_dependency 'rubyzip'
+  s.add_dependency 'dbd', '>= 0.0.18'
+  s.add_dependency 'dbd_onto'
 
   s.add_development_dependency 'haml-rails'
   s.add_development_dependency 'rspec-rails'

data/lib/dbd_data_engine/version.rb

@@ -1,3 +1,3 @@
 module DbdDataEngine
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/dbd_data_engine.rb

@@ -1,6 +1,7 @@
 require 'dbd_data_engine/engine'
 require 'haml'
 require 'dbd'
+require 'dbd_onto'
 
 module DbdDataEngine
 end

data/spec/features/contexts/index_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'rspec/mocks'
+
+module DbdDataEngine
+  describe ContextsController do
+    describe 'GET /data/contexts' do
+      context 'routing' do
+        it 'contexts_path is correct' do
+          dbd_data_engine.contexts_path.should == '/data/contexts'
+        end
+      end
+
+      ::RSpec::Mocks.setup(self)
+
+      before(:each) do
+        graph = Dbd::Graph.new
+        graph << Dbd::ContextFact.new(subject: Dbd::Fact.factory.new_subject,
+                          predicate: 'foobar',
+                          object: 'tuxping')
+        Dbd::Graph.any_instance.stub(:from_unsorted_CSV_file).and_return(graph)
+      end
+
+      context 'page content' do
+
+        before(:each) do
+          visit(dbd_data_engine.contexts_path)
+        end
+
+        it 'talks about contexts' do
+          expect(page).to have_text('Contexts')
+        end
+
+        it 'shows a test context' do
+          expect(page).to have_text('foobar')
+          expect(page).to have_text('tuxping')
+        end
+      end
+    end
+  end
+end

data/spec/features/contexts/new_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module DbdDataEngine
+  describe ContextsController do
+    describe 'GET /data/contexts/new' do
+      context 'routing' do
+        it 'new_contexts_path is correct' do
+          dbd_data_engine.new_context_path.should == '/data/contexts/new'
+        end
+      end
+
+      context 'page content' do
+
+        before(:each) do
+          visit(dbd_data_engine.new_context_path)
+        end
+
+        it 'talks about a new context' do
+          expect(page.text).to match(/new context/i)
+        end
+
+        it 'has a label array with context:visibility as value' do
+          expect(page).to have_field('predicate[]', type: 'text', count: 6)
+        end
+
+        it 'has a field array' do
+          expect(page).to have_field('object[]', count: 6)
+        end
+      end
+    end
+  end
+end

data/spec/features/resources/index_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'rspec/mocks'
+
+module DbdDataEngine
+  describe ResourcesController do
+    describe 'GET /data/resources' do
+      context 'routing' do
+        it 'resources_path is correct' do
+          dbd_data_engine.resources_path.should == '/data/resources'
+        end
+      end
+
+      ::RSpec::Mocks.setup(self)
+
+      before(:each) do
+        graph = Dbd::Graph.new
+        graph << Dbd::ContextFact.new(subject: Dbd::Fact.factory.new_subject,
+                          predicate: 'foobar',
+                          object: 'tuxping')
+        Dbd::Graph.any_instance.stub(:from_unsorted_CSV_file).and_return(graph)
+      end
+
+      context 'page content' do
+
+        before(:each) do
+          visit(dbd_data_engine.resources_path)
+        end
+
+        it 'talks about resources' do
+          expect(page).to have_text('Resources')
+        end
+
+        it 'shows a test resource' do
+          expect(page).to have_text('foobar')
+          expect(page).to have_text('tuxping')
+        end
+      end
+    end
+  end
+end

data/spec/features/{resources_spec.rb → resources/new_spec.rb}

@@ -2,25 +2,6 @@ require 'spec_helper'
 
 module DbdDataEngine
   describe ResourcesController do
-    describe 'GET /data/resources' do
-      context 'routing' do
-        it 'resources_path is correct' do
-          dbd_data_engine.resources_path.should == '/data/resources'
-        end
-      end
-
-      context 'page content' do
-
-        before(:each) do
-          visit(dbd_data_engine.resources_path)
-        end
-
-        it 'talks about resources' do
-          expect(page).to have_text('Resources')
-        end
-      end
-    end
-
     describe 'GET /data/resources/new' do
       context 'routing' do
         it 'new_resources_path is correct' do

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

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module DbdDataEngine
+  describe Context do
+    let(:context_predicates) {
+      ['context:visibility',
+       'context:encryption',
+       'context:license',
+       'dc:source',
+       'dc:creator',
+       'dcterms:created']}
+
+    it 'has all the context predicates' do
+      described_class.predicates.should == context_predicates
+    end
+  end
+end

data/spec/requests/contexts/create_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+module DbdDataEngine
+  describe ContextsController do
+    context 'POST /data/contexts' do
+      context 'routing' do
+        it 'contexts_path is correct' do
+          dbd_data_engine.contexts_path.should == '/data/contexts'
+        end
+      end
+
+      context 'creating the resource from parameters' do
+
+        let(:test_filename) { 'data/test_graph.csv' }
+
+        let(:one_fact) do
+          {'predicate' => ['schema:givenName'],
+           'object' => ['Peter']}
+        end
+
+        let(:two_facts) do
+          {'predicate' => ['schema:givenName', 'schema:familyName'],
+           'object' => ['Peter', 'Vandenabeele']}
+        end
+
+        let(:two_other_facts) do
+          {'predicate' => ['schema:givenName', 'schema:familyName'],
+           'object' => ['Frans', 'VDA']}
+        end
+
+        before(:each) { DbdDataEngine.stub(:default_CSV_location).and_return(test_filename) }
+
+        describe 'with correct parameters' do
+          it 'with correct data does_not raise_error' do
+            post(dbd_data_engine.contexts_path, one_fact)
+          end
+
+          it 'calls Dbd::Context.new' do
+            Dbd::Context.should_receive(:new).and_call_original
+            post(dbd_data_engine.contexts_path, one_fact)
+          end
+
+          before(:each) do
+            Dbd::Graph.new.to_CSV_file(test_filename) # empty the file
+          end
+
+          def read_back_graph
+            Dbd::Graph.new.from_unsorted_CSV_file(test_filename)
+          end
+
+          context 'with 1 line, creates 1 resource' do
+
+            before(:each) { post(dbd_data_engine.contexts_path, one_fact) }
+
+            it 'adds 1 line to the graph' do
+              read_back_graph.size.should == 1
+            end
+
+            it 'shows the result' do
+              expect(response.body).to include('schema:givenName')
+              expect(response.body).to include('Peter')
+            end
+          end
+
+          context 'with 2 lines, creates resource with 2 facts' do
+
+            before(:each) { post(dbd_data_engine.contexts_path, two_facts) }
+
+            it 'adds 2 lines to the graph' do
+              read_back_graph.size.should == 2
+            end
+
+            it 'the 2 facts have the same subject (1 resource)' do
+              read_back_graph.map(&:subject).uniq.size.should == 1
+            end
+
+            it 'shows the result' do
+              expect(response.body).to include('schema:givenName')
+              expect(response.body).to include('Peter')
+              expect(response.body).to include('schema:familyName')
+              expect(response.body).to include('Vandenabeele')
+            end
+          end
+
+          context 'with 2 submits of 2 lines, creates 2 contexts' do
+            context 'submits directly after each other' do
+
+              before(:each) do
+                post(dbd_data_engine.contexts_path, two_facts)
+                post(dbd_data_engine.contexts_path, two_other_facts)
+              end
+
+              it 'adds 4 lines to the graph in the file' do
+                read_back_graph.size.should == 4
+              end
+
+              it 'the 4 facts are of 2 contexts' do
+                read_back_graph.map(&:subject).uniq.size.should == 2
+              end
+            end
+
+            it 'shows the results for each submit' do
+              post(dbd_data_engine.contexts_path, two_facts)
+              expect(response.body).to include('schema:givenName')
+              expect(response.body).to include('Peter')
+              expect(response.body).to include('schema:familyName')
+              expect(response.body).to include('Vandenabeele')
+              post(dbd_data_engine.contexts_path, two_other_facts)
+              expect(response.body).to include('Frans')
+              expect(response.body).to include('VDA')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/requests/{resources_spec.rb → resources/create_spec.rb}

@@ -112,6 +112,9 @@ module DbdDataEngine
           end
 
           context 'with multi-threaded requests does a clean write' do
+
+            before(:each) { pending("multi-threaded tests fail on JRuby") if RUBY_PLATFORM == 'java' }
+
             it 'does not fail on parallel access (also tested on 1000.times)' do
               threads = []
               [two_facts, two_other_facts].each do |resource|

data/spec/views/dbd_data_engine/contexts/create.html.haml_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe 'dbd_data_engine/contexts/create.html.haml' do
+  it 'renders' do
+    a = OpenStruct.new(predicate: 'foo', object: 'bar')
+    @context = [a]
+    render
+  end
+end

data/spec/views/dbd_data_engine/contexts/index.html.haml_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'dbd_data_engine/contexts/index.html.haml' do
+
+  let(:contexts) { [:foo] }
+
+  before(:each) { @contexts = contexts }
+
+  it 'renders' do
+    render
+  end
+
+  it 'renders the context partial' do
+    render.should render_template(partial: '_context')
+  end
+end

data/spec/views/dbd_data_engine/contexts/new.html.haml_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'dbd_data_engine/contexts/new.html.haml' do
+  context 'renders' do
+
+    before(:each) do
+      @predicates = DbdDataEngine::Context.predicates
+      render
+    end
+
+    it 'without exceptions' do
+      #should_not raise_error
+    end
+
+    it 'has table header "predicate"' do
+      rendered.should have_xpath('.//table/tr/th', :text => 'predicate')
+    end
+
+    it 'has table header "object"' do
+      rendered.should have_xpath('.//table/tr/th', :text => 'object')
+    end
+
+    it 'has an array of drop down select boxes with predicates' do
+      rendered.should have_field('predicate[]')
+    end
+
+    it 'has an array of fields with objects' do
+      rendered.should have_field('object[]')
+    end
+
+    it 'has a submit button' do
+      rendered.should have_button('Submit')
+    end
+
+    it 'has a form that posts to /data/contexts' do
+      rendered.should have_xpath('.//form[@action="/data/contexts"][@method="post"]', :text => 'predicate')
+    end
+  end
+end

data/spec/views/dbd_data_engine/resources/index.html.haml_spec.rb

@@ -1,7 +1,16 @@
 require 'spec_helper'
 
 describe 'dbd_data_engine/resources/index.html.haml' do
+
+  let(:resources) { [:foo] }
+
+  before(:each) { @resources = resources }
+
   it 'renders' do
     render
   end
+
+  it 'renders the resource partial' do
+    render.should render_template(partial: '_resource')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd_data_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,16 +58,16 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: dbd_onto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -171,11 +171,19 @@ files:
 - app/assets/images/dbd_data_engine/.keep
 - app/assets/stylesheets/dbd_data_engine/application.css
 - app/controllers/dbd_data_engine/application_controller.rb
+- app/controllers/dbd_data_engine/contexts_controller.rb
 - app/controllers/dbd_data_engine/data_controller.rb
 - app/controllers/dbd_data_engine/resources_controller.rb
 - app/helpers/dbd_data_engine/application_helper.rb
+- app/models/dbd_data_engine/context.rb
+- app/views/dbd_data_engine/contexts/_context.html.haml
+- app/views/dbd_data_engine/contexts/_context_fact.html.haml
+- app/views/dbd_data_engine/contexts/create.html.haml
+- app/views/dbd_data_engine/contexts/index.html.haml
+- app/views/dbd_data_engine/contexts/new.html.haml
 - app/views/dbd_data_engine/data/index.html.haml
 - app/views/dbd_data_engine/resources/_fact.html.haml
+- app/views/dbd_data_engine/resources/_resource.html.haml
 - app/views/dbd_data_engine/resources/create.html.haml
 - app/views/dbd_data_engine/resources/index.html.haml
 - app/views/dbd_data_engine/resources/new.html.haml
@@ -227,10 +235,18 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/features/data_spec.rb
-- spec/features/resources_spec.rb
-- spec/requests/resources_spec.rb
+- spec/features/contexts/index_spec.rb
+- spec/features/contexts/new_spec.rb
+- spec/features/data/data_spec.rb
+- spec/features/resources/index_spec.rb
+- spec/features/resources/new_spec.rb
+- spec/models/dbd_data_engine/context/predicates_spec.rb
+- spec/requests/contexts/create_spec.rb
+- spec/requests/resources/create_spec.rb
 - spec/spec_helper.rb
+- spec/views/dbd_data_engine/contexts/create.html.haml_spec.rb
+- spec/views/dbd_data_engine/contexts/index.html.haml_spec.rb
+- spec/views/dbd_data_engine/contexts/new.html.haml_spec.rb
 - spec/views/dbd_data_engine/data/index.html.haml_spec.rb
 - spec/views/dbd_data_engine/resources/create.html.haml_spec.rb
 - spec/views/dbd_data_engine/resources/index.html.haml_spec.rb
@@ -299,10 +315,18 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/features/data_spec.rb
-- spec/features/resources_spec.rb
-- spec/requests/resources_spec.rb
+- spec/features/contexts/index_spec.rb
+- spec/features/contexts/new_spec.rb
+- spec/features/data/data_spec.rb
+- spec/features/resources/index_spec.rb
+- spec/features/resources/new_spec.rb
+- spec/models/dbd_data_engine/context/predicates_spec.rb
+- spec/requests/contexts/create_spec.rb
+- spec/requests/resources/create_spec.rb
 - spec/spec_helper.rb
+- spec/views/dbd_data_engine/contexts/create.html.haml_spec.rb
+- spec/views/dbd_data_engine/contexts/index.html.haml_spec.rb
+- spec/views/dbd_data_engine/contexts/new.html.haml_spec.rb
 - spec/views/dbd_data_engine/data/index.html.haml_spec.rb
 - spec/views/dbd_data_engine/resources/create.html.haml_spec.rb
 - spec/views/dbd_data_engine/resources/index.html.haml_spec.rb