dbd_data_engine 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e443546e597aa0bac7e6543c2e374f0869f0181e
-  data.tar.gz: a48b8d03a58903e4a047e022582613e50d9ccfef
+  metadata.gz: b85dd2704a4f68d94228e1e3f0f26c4056b884f7
+  data.tar.gz: 705971c483babbbe48bd2a6a6f45b567f239c6c8
 SHA512:
-  metadata.gz: 84a97ae9055f9bed78e2c854cc0ffda1eea2c5ffc3ddc30333bb870fc04cd90494855bc17e660386ba639f87d5e2a68fe840ea00e630590995a6bed19526c0e0
-  data.tar.gz: 0381cd6457247c95e6a3404519e0446afe94a9f5ac6f1786743201149b05f19523fdd47d773a96c04c89e6e7fd7290f6e67e7f275c92e0637167fe40b66d0899
+  metadata.gz: 9dd1042543ffdd33cb52a81a82e28b7e125a6c5faa2a9fd18c4d308ce074ef3f76bcfe9c0901d49ea9eec84e90ed9dde3e54e5066d9322442e03cf4bd152bbc4
+  data.tar.gz: 34cdd6ebc692befb6ad4b7278b86ab412d6c4ae7f58380026e5658a2362637370cae05ddf7d53c4700fab42e89a2491152d50d22aacccf664d4fd7c8605b2369

data/.gitignore

@@ -9,3 +9,6 @@ spec/dummy/.sass-cache
 Gemfile.lock
 /.idea
 /tmp
+/data/graph.csv
+/data/test_graph.csv
+/spec/dummy/data/graph.csv

data/Guardfile

@@ -6,10 +6,19 @@ 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/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/features/#{m[1]}_spec.rb"] }
+  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"]
+  end
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { ["spec/controllers", "spec/features"] }
+  watch('app/controllers/dbd_data_engine/application_controller.rb') do
+    ["spec/controllers",
+     "spec/features",
+     "spec/requests"]
+  end
 
   # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }

data/HISTORY.txt

@@ -0,0 +1,5 @@
+0.0.1 (2013-08-12)
+=====
+
+* Initial controller on /data (no real functionality)
+* can be mounted from dbd_demo

data/README.md

@@ -1,3 +1,9 @@
 This is a Rails Engine that will allow entering and viewing data for [Dbd].
 
+It used in the [DbdDemo] app.
+
+[![Gem Version](https://badge.fury.io/rb/dbd_data_engine.png)](http://badge.fury.io/rb/dbd_data_engine)
+[![Build Status](https://travis-ci.org/petervandenabeele/dbd_data_engine.png?branch=master)](http://travis-ci.org/petervandenabeele/dbd_data_engine)
+
 [Dbd]:                https://github.com/petervandenabeele/dbd#readme
+[DbdDemo]:            https://github.com/petervandenabeele/dbd_demo#readme

data/app/controllers/dbd_data_engine/data_controller.rb

@@ -4,14 +4,5 @@ module DbdDataEngine
   class DataController < ApplicationController
     def index
     end
-
-    def show
-    end
-
-    def new
-    end
-
-    def create
-    end
   end
 end

data/app/controllers/dbd_data_engine/resources_controller.rb

@@ -0,0 +1,34 @@
+require_dependency "dbd_data_engine/application_controller"
+
+module DbdDataEngine
+  class ResourcesController < ApplicationController
+    def index
+    end
+
+    def new
+      @predicates = ['schema:givenName','schema:familyName']
+    end
+
+    def create
+      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})
+        @resource << fact
+      end
+      graph << @resource
+      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/views/dbd_data_engine/resources/_fact.html.haml

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

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

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

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

@@ -0,0 +1,2 @@
+%h1 Resources#index
+%p Find me in app/views/dbd_data_engine/resources/index.html.haml

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

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

data/config/routes.rb

@@ -1,5 +1,6 @@
 DbdDataEngine::Engine.routes.draw do
-  resource 'data', only: [:new, :create]
-  get 'data/' => 'data#index', as: :data_index
-  get 'data/:id' => 'data#show', as: :data_show
+  resources 'data', only: [:index]
+  scope 'data' do
+    resources 'resources', only: [:index, :new, :create]
+  end
 end

data/dbd_data_engine.gemspec

@@ -23,6 +23,7 @@ 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.16'
 
   s.add_development_dependency 'haml-rails'
   s.add_development_dependency 'rspec-rails'

data/lib/dbd_data_engine/engine.rb

@@ -9,4 +9,8 @@ module DbdDataEngine
       g.template_engine :haml
     end
   end
+
+  def self.default_CSV_location
+    'data/graph.csv'
+  end
 end

data/lib/dbd_data_engine/version.rb

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

data/lib/dbd_data_engine.rb

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

data/spec/controllers/dbd_data_engine/data_controller_spec.rb

@@ -2,5 +2,6 @@ require 'spec_helper'
 
 module DbdDataEngine
   describe DataController do
+    # nothing here; the routes are not correctly set-up
   end
 end

data/spec/features/data_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 module DbdDataEngine
-  describe "Data" do
-    describe "GET /data" do
-      context "routing" do
-        it "when the engine is mounted under /" do
-          dbd_data_engine.data_index_path.should == '/data'
+  describe 'Data' do
+    describe 'GET /data' do
+      context 'routing' do
+        it 'when the engine is mounted under /' do
+          dbd_data_engine.data_path.should == '/data'
         end
       end
 
-      context "page content" do
+      context 'page content' do
 
         before(:each) do
-          visit(dbd_data_engine.data_index_path)
+          visit(dbd_data_engine.data_path)
         end
 
-        it "shows the data" do
+        it 'talks about data' do
           expect(page).to have_text('Data')
         end
       end

data/spec/features/resources_spec.rb

@@ -0,0 +1,51 @@
+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
+          dbd_data_engine.new_resource_path.should == '/data/resources/new'
+        end
+      end
+
+      context 'page content' do
+
+        before(:each) do
+          visit(dbd_data_engine.new_resource_path)
+        end
+
+        it 'talks about a new resource' do
+          expect(page.text).to match(/new resource/i)
+        end
+
+        it 'has a select box array with schema:givenName as option' do
+          expect(page).to have_select('predicate[]', options: ['schema:givenName','schema:familyName'])
+        end
+
+        it 'has a field array' do
+          expect(page).to have_field('object[]')
+        end
+      end
+    end
+  end
+end

data/spec/requests/resources_spec.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+module DbdDataEngine
+  describe ResourcesController do
+    context 'POST /data/resources' do
+      context 'routing' do
+        it 'resources_path is correct' do
+          dbd_data_engine.resources_path.should == '/data/resources'
+        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.resources_path, one_fact)
+          end
+
+          it 'calls Dbd::Resource.new' do
+            Dbd::Resource.should_receive(:new).and_call_original
+            post(dbd_data_engine.resources_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.resources_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.resources_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 resources' do
+            context 'submits directly after each other' do
+
+              before(:each) do
+                post(dbd_data_engine.resources_path, two_facts)
+                post(dbd_data_engine.resources_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 resources' do
+                read_back_graph.map(&:subject).uniq.size.should == 2
+              end
+            end
+
+            it 'shows the results for each submit' do
+              post(dbd_data_engine.resources_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.resources_path, two_other_facts)
+              expect(response.body).to include('Frans')
+              expect(response.body).to include('VDA')
+            end
+          end
+
+          context 'with multi-threaded requests does a clean write' do
+            it 'does not fail on parallel access (also tested on 1000.times)' do
+              threads = []
+              [two_facts, two_other_facts].each do |resource|
+                threads << Thread.new(resource) do |_resource|
+                  10.times { post(dbd_data_engine.resources_path, _resource) }
+                end
+              end
+              threads.each { |thread| thread.join }
+              read_back_graph
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

data/spec/views/dbd_data_engine/{data/new.html.haml_spec.rb → resources/index.html.haml_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'dbd_data_engine/data/new.html.haml' do
+describe 'dbd_data_engine/resources/index.html.haml' do
   it 'renders' do
     render
   end

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

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'dbd_data_engine/resources/new.html.haml' do
+  context 'renders' do
+
+    before(:each) do
+      @predicates = ['schema:givenName', 'schema:familyName']
+      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_select('predicate[]', options: ['schema:givenName', 'schema:familyName'])
+    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/resources' do
+      rendered.should have_xpath('.//form[@action="/data/resources"][@method="post"]', :text => 'predicate')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd_data_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dbd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.16
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - .travis.yml
 - Gemfile
 - Guardfile
+- HISTORY.txt
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -143,14 +158,17 @@ files:
 - app/assets/stylesheets/dbd_data_engine/application.css
 - app/controllers/dbd_data_engine/application_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/views/dbd_data_engine/data/create.html.haml
 - app/views/dbd_data_engine/data/index.html.haml
-- app/views/dbd_data_engine/data/new.html.haml
-- app/views/dbd_data_engine/data/show.html.haml
+- app/views/dbd_data_engine/resources/_fact.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
 - app/views/layouts/dbd_data_engine/application.html.erb
 - bin/rails
 - config/routes.rb
+- data/.gitkeep
 - dbd_data_engine.gemspec
 - lib/dbd_data_engine.rb
 - lib/dbd_data_engine/engine.rb
@@ -188,6 +206,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/data/.gitkeep
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -195,11 +214,13 @@ files:
 - 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/spec_helper.rb
-- spec/views/dbd_data_engine/data/create.html.haml_spec.rb
 - spec/views/dbd_data_engine/data/index.html.haml_spec.rb
-- spec/views/dbd_data_engine/data/new.html.haml_spec.rb
-- spec/views/dbd_data_engine/data/show.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
+- spec/views/dbd_data_engine/resources/new.html.haml_spec.rb
 homepage: https://github.com/petervandenabeele/dbd_data_engine
 licenses:
 - MIT
@@ -257,6 +278,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/data/.gitkeep
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -264,8 +286,10 @@ test_files:
 - 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/spec_helper.rb
-- spec/views/dbd_data_engine/data/create.html.haml_spec.rb
 - spec/views/dbd_data_engine/data/index.html.haml_spec.rb
-- spec/views/dbd_data_engine/data/new.html.haml_spec.rb
-- spec/views/dbd_data_engine/data/show.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
+- spec/views/dbd_data_engine/resources/new.html.haml_spec.rb

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

@@ -1,2 +0,0 @@
-%h1 Data#create
-%p Find me in app/views/dbd_data_engine/data/create.html.haml

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

@@ -1,2 +0,0 @@
-%h1 Data#new
-%p Find me in app/views/dbd_data_engine/data/new.html.haml

data/app/views/dbd_data_engine/data/show.html.haml

@@ -1,2 +0,0 @@
-%h1 Data#show
-%p Find me in app/views/dbd_data_engine/data/show.html.haml

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

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe 'dbd_data_engine/data/create.html.haml' do
-  it 'renders' do
-    render
-  end
-end

data/spec/views/dbd_data_engine/data/show.html.haml_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe 'dbd_data_engine/data/show.html.haml' do
-  it 'renders' do
-    render
-  end
-end