dbd_data_engine 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f85724f9a57475c424c42dac21fe88581b5bd6
-  data.tar.gz: d9c19869fa7dcc87a4d0e8c838bd772770109607
+  metadata.gz: 197c8d325bba5a9fe3f566a4d7ad4d120b44c5db
+  data.tar.gz: 6c17d98cb2ff05c024b000e4a8484dbad82e2cd1
 SHA512:
-  metadata.gz: df2e89cf55cd92187eb6fde6e4271eb5b654fbdffcf339aaa97922b202f2b1c3b0c2ca1585edfec549464a6e14447ebbd9758234f468d3dfe16f77f90cfe6efa
-  data.tar.gz: a9db5852d4904c510126e42a54b6045958aca60353046fc3cac15e59e18ed0bdd9c1a965ca2682968176fb8b79d301c0d134ba9c73495ce52ae03905850b6719
+  metadata.gz: 34902f849a16291413b2a7d19e7143e7fa506a5d547777dcfa38795d1b91b1e7d04e2cbb6ce398c98bdb1f03ff2e9bdc1bb12e3106d18a1d871f5fa9fa782d89
+  data.tar.gz: b7b77ce9e4e58b3424e8cd0dc831a5d7c8baf5ca877a9b465465ee09a9a075519380939759a243d68fab0151b9ce2fb96e011e61b617141b0087ef646a02775f

data/Gemfile

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

data/Guardfile

@@ -7,6 +7,7 @@ guard 'rspec', :all_on_start => true, :all_after_pass => true do
   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/presenters/(.*)\.rb$})                { |m| "spec/presenters/#{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",

data/HISTORY.txt

@@ -26,3 +26,10 @@
 * add a naive DbdDataEngine::Context model
 * add a naive ContextsController
 * it takes the predicates for the "new" screen from DbdOnto::Context
+
+0.0.6 (2013-10-25)
+=====
+
+* upgrade to dbd 0.1.0
+* stylsheets
+* default contexts ("public today" etc.)

data/app/assets/stylesheets/dbd_data_engine/application.css

@@ -1,5 +1,5 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * This is a manifest file that will be compiled into application.css, which will include all the files
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
@@ -9,5 +9,5 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require_tree '../dbd_data_engine'
  */

data/app/assets/stylesheets/dbd_data_engine/context.css

@@ -0,0 +1,17 @@
+.context table {
+    margin-top: 5px;
+    margin-bottom: 15px;
+    margin-left: 5px;
+    border: 1px solid darkgray;
+    color: darkblue;
+    border-collapse:collapse;
+}
+
+.context td {
+    padding: 3px;
+    border: 1px dotted darkgray;
+}
+
+.context_color{
+    color: darkblue;
+}

data/app/assets/stylesheets/dbd_data_engine/resource.css

@@ -0,0 +1,13 @@
+.resource table {
+    margin-top: 5px;
+    margin-bottom: 15px;
+    margin-left: 5px;
+    border: 1px solid darkgray;
+    color: darkgreen;
+    border-collapse:collapse;
+}
+
+.resource td {
+    padding: 3px;
+    border: 1px dotted darkgray;
+}

data/app/controllers/dbd_data_engine/contexts_controller.rb

@@ -5,7 +5,7 @@ module DbdDataEngine
     def index
       graph = Dbd::Graph.new
       graph = graph.from_unsorted_CSV_file(filename)
-      @contexts = graph.subjects.map{ |s| graph.by_subject(s) }
+      @contexts = graph.contexts
     end
 
     def new
@@ -17,10 +17,12 @@ module DbdDataEngine
       @context = Dbd::Context.new()
       [params[:predicate], params[:object]].transpose.each do |predicate, object|
         context_fact = Dbd::ContextFact.new(predicate: predicate,
+                                            object_type: 's',
                                             object:    object)
         @context << context_fact
       end
       graph << @context
+      # TODO move this to graph
       new_data = graph.to_CSV
       File.open(filename, 'a') do |f|
         f.syswrite new_data

data/app/controllers/dbd_data_engine/resources_controller.rb

@@ -1,30 +1,39 @@
-require_dependency "dbd_data_engine/application_controller"
+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) }
+      @resources_with_contexts = resources_with_contexts(current_graph)
     end
 
     def new
+      @contexts = ['public today', 'personal today', 'business today']
       @predicates = ['schema:givenName','schema:familyName']
     end
 
     def create
-      graph = Dbd::Graph.new
-      @resource = Dbd::Resource.new(context_subject: Dbd::Context.new_subject)
+      # FIXME refactor to smaller function (green first, refactor next)
+      @context = Context.default_from_params(params[:context], current_graph)
+      @resource = Dbd::Resource.new(context_subject: @context.subject)
       [params[:predicate], params[:object]].transpose.each do |predicate, object|
-        fact = Dbd::Fact.new(predicate: predicate,
-                             object:    object)
-        @resource << fact
+        @resource << Dbd::Fact.new(
+          predicate: predicate,
+          object_type: 's',
+          object: object)
       end
-      graph << @resource
-      new_data = graph.to_CSV
+
+      # prepare the graph to append
+      append_graph = Dbd::Graph.new
+      append_graph << @context unless @context.first.time_stamp # only if not yet persisted?
+      append_graph << @resource
+      # TODO this can probably move to Dbd::Graph#append_to_file(filename)
+      append_csv = append_graph.to_CSV
       File.open(filename, 'a') do |f|
-        f.syswrite new_data
+        f.syswrite append_csv
       end
+
+      redirect_to('/data/resources')
     end
 
   private
@@ -33,5 +42,16 @@ module DbdDataEngine
       DbdDataEngine.default_CSV_location
     end
 
+    def current_graph
+      Dbd::Graph.new.from_unsorted_CSV_file(filename)
+    end
+
+    def resources_with_contexts(graph)
+      graph.resources.map do |resource|
+        ResourceWithContexts.new(
+          resource: resource,
+          graph: graph)
+      end
+    end
   end
 end

data/app/models/dbd_data_engine/context.rb

@@ -1,13 +1,124 @@
 module DbdDataEngine
   class Context
+
     def self.predicates
-      ::DbdOnto::Context.new.
-        select do |fact|
-          fact.predicate == 'meta:defines_predicate'
-        end.
-        map do |fact|
-          fact.object
+      resources = ::DbdOnto::Context.new.resources
+      predicate_defining_resources = select_with_defines_predicate(resources)
+      make_predicate_label_hash(predicate_defining_resources)
+    end
+
+    def self.public_today
+      context_from_context_facts(public_today_context_facts)
+    end
+
+    def self.personal_today
+      context_from_context_facts(personal_today_context_facts)
+    end
+
+    def self.business_today
+      context_from_context_facts(business_today_context_facts)
+    end
+
+    def self.default_from_params(context_param, current_graph)
+      find_context(context_param, current_graph) || create_context(context_param)
+    end
+
+  private
+
+    def self.find_context(context_param, current_graph)
+      if current_graph
+        # the first occurrence is OK (no drama if multiple)
+        current_graph.contexts.detect do |context|
+          (cv = single_fact_on_predicate(context, 'context:visibility')) &&
+          cv.object == visibility(context_param) &&
+          (dc = single_fact_on_predicate(context, 'dcterms:created')) &&
+          dc.object == today.to_s
+        end
+      end
+    end
+
+    def self.create_context(context_param)
+      case context_param
+        when 'public today'
+          public_today
+        when 'personal today'
+          personal_today
+        when 'business today'
+          business_today
+        else
+          raise "A valid context must be given (was given: #{context_param})"
+      end
+    end
+
+    def self.visibility(context_param)
+      context_param.split(/ /).first
+    end
+
+    def self.today
+      Date.today
+    end
+
+    def self.context_from_context_facts(context_fact_array)
+      Dbd::Context.new.tap do |context|
+        context_fact_array.each do |predicate, object_type, object| # splat
+          context << Dbd::ContextFact.new(
+            predicate: predicate,
+            object_type: object_type,
+            object: object)
         end
+      end
+    end
+
+    def self.public_today_context_facts
+      [['context:visibility','s','public'],
+       ['context:encryption','s','clear'],
+       ['context:license','s',"CC BY, Copyright #{today.year} Peter Vandenabeele"]] +
+        common_today_context_facts
+    end
+
+    def self.personal_today_context_facts
+      [['context:visibility','s','personal']] +
+        encrypted_and_rights_reserved_and_common
+    end
+
+    def self.business_today_context_facts
+      [['context:visibility','s','business']] +
+        encrypted_and_rights_reserved_and_common
+    end
+
+    def self.encrypted_and_rights_reserved_and_common
+      [['context:encryption','s','encrypted'],
+       ['context:license','s',"All rights reserved, Copyright #{today.year} Peter Vandenabeele"]] +
+        common_today_context_facts
+    end
+
+    def self.common_today_context_facts
+      [['dc:source','s','manual by Peter Vandenabeele'],
+       ['dc:creator','s','Peter Vandenabeele'],
+       ['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
+        label = single_fact_on_predicate(resource, 'rdfs:label').object
+        { predicate: predicate,
+          label: label }
+      end
+    end
+
+    def self.single_fact_on_predicate(resource, predicate)
+      resource.select do |fact|
+        fact.predicate == predicate
+      end.single
     end
   end
-end
+end

data/app/presenters/context_presenter.rb

@@ -0,0 +1,18 @@
+class ContextPresenter
+  def initialize(options)
+    @context = options.fetch(:context)
+  end
+
+  def context_summary
+    visibility = get_objects_for_predicate(@context, 'context:visibility')
+    created = get_objects_for_predicate(@context, 'dcterms:created')
+    "#{visibility.join(', ')} #{created.join(', ')}"
+  end
+
+private
+
+  def get_objects_for_predicate(context, predicate)
+    context.select{ |cf| cf.predicate == predicate }.map(&:object)
+  end
+
+end

data/app/presenters/fact_with_context.rb

@@ -0,0 +1,14 @@
+class FactWithContext
+  attr_reader :fact
+
+  def initialize(options)
+    @fact = options.fetch(:fact)
+    @graph = options.fetch(:graph)
+  end
+
+  def context_summary
+    context = @graph.by_subject(@fact.context_subject)
+    ContextPresenter.new(context: context).context_summary
+  end
+
+end

data/app/presenters/resource_with_contexts.rb

@@ -0,0 +1,14 @@
+class ResourceWithContexts
+  include Enumerable
+
+  def initialize(options)
+    @resource = options.fetch(:resource)
+    @graph = options.fetch(:graph)
+  end
+
+  def each
+    @resource.each do |fact|
+      yield FactWithContext.new(fact: fact, graph: @graph)
+    end
+  end
+end

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

@@ -1 +1,4 @@
-%table= render partial: 'context_fact', collection: context
+%div.context
+  %h3= ContextPresenter.new(context: context).context_summary
+  %table
+    = render partial: 'dbd_data_engine/contexts/context_fact', collection: context.to_a

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

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

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

@@ -1,4 +1,5 @@
-%h1 Contexts#index
+%h1 Contexts
 
-- @contexts.each do |context|
-  = render partial: 'context', object: context
+= render partial: 'dbd_data_engine/shared/links'
+
+= render partial: 'context', collection: @contexts

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

@@ -3,11 +3,12 @@
 = form_tag('/data/contexts', method: :post) do # engine controller route not loaded in view tests
   %table
     %tr
-      %th predicate
-      %th object
+      %th Predicate
+      %th Object
     - @predicates.each do |predicate|
       %tr
-        %td= text_field_tag('predicate[]', predicate)
+        %td= label_tag("#{predicate[:label]} (#{predicate[:predicate]})")
         %td= text_field_tag('object[]')
+        %td= text_field_tag('predicate[]', predicate[:predicate], hidden: true)
 
   %p= submit_tag('Submit')

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

@@ -1,2 +1,8 @@
-%h1 Data#index
-%p Find me in app/views/dbd_data_engine/data/index.html.haml
+%h1 Data
+
+= render partial: 'dbd_data_engine/shared/links'
+
+%h2 See and create #{link_to('contexts','/data/contexts')}
+%h2 See and create #{link_to('resources','/data/resources')}
+
+

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

@@ -0,0 +1,4 @@
+%tr
+  %td= fact_with_context.fact.predicate
+  %td= fact_with_context.fact.object
+  %td.context_color= fact_with_context.context_summary

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

@@ -0,0 +1,3 @@
+%div.resource
+  %table
+    = render partial: 'fact_with_context', collection: resource_with_contexts.to_a

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

@@ -1,4 +1,5 @@
-%h1 Resources#index
+%h1 Resources
 
-- @resources.each do |resource|
-  = render partial: 'resource', object: resource
+= render partial: 'dbd_data_engine/shared/links'
+
+= render partial: 'resource_with_contexts', collection: @resources_with_contexts

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

@@ -1,6 +1,9 @@
 %h1 Create a new resource
 
 = 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))
   %table
     %tr
       %th predicate

data/app/views/dbd_data_engine/shared/_links.html.haml

@@ -0,0 +1,5 @@
+%p
+  =link_to 'resources', '/data/resources'
+  =link_to 'contexts', '/data/contexts'
+  =link_to 'new resource', '/data/resources/new'
+  =link_to 'new context', '/data/contexts/new'

data/app/views/layouts/dbd_data_engine/application.html.haml

@@ -0,0 +1,8 @@
+!!!
+%html
+  %head
+    %title DbdDataEngine
+    = stylesheet_link_tag 'dbd_data_engine/application'
+    = csrf_meta_tags
+  %body
+    = yield

data/dbd_data_engine.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rake'
-  s.add_dependency 'rails', '>= 4.0.0'
+  s.add_dependency 'rails', '>= 4.0.1.rc3'
   s.add_dependency 'haml'
-  s.add_dependency 'dbd', '>= 0.0.18'
-  s.add_dependency 'dbd_onto'
+  s.add_dependency 'dbd', '~> 0.1.0'
+  s.add_dependency 'dbd_onto', '~> 0.0.12'
 
   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.5"
+  VERSION = "0.0.6"
 end

data/spec/features/contexts/index_spec.rb

@@ -13,11 +13,8 @@ module DbdDataEngine
       ::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)
+        Dbd::Graph.any_instance.stub(:from_unsorted_CSV_file).
+          and_return(TestFactories::Graph.full)
       end
 
       context 'page content' do
@@ -31,8 +28,13 @@ module DbdDataEngine
         end
 
         it 'shows a test context' do
-          expect(page).to have_text('foobar')
-          expect(page).to have_text('tuxping')
+          expect(page).to have_text('context:visibility')
+          expect(page).to have_text('public')
+        end
+
+        it 'does not show Facts (only Contexts)' do
+          expect(page).to_not have_text('fact_predicate')
+          expect(page).to_not have_text('whooha')
         end
       end
     end

data/spec/features/contexts/new_spec.rb

@@ -19,11 +19,15 @@ module DbdDataEngine
           expect(page.text).to match(/new context/i)
         end
 
-        it 'has a label array with context:visibility as value' do
+        it 'has a field array with predicates' do
           expect(page).to have_field('predicate[]', type: 'text', count: 6)
         end
 
-        it 'has a field array' do
+        it 'has a field array with predicate context:visibility' do
+          expect(page).to have_field('predicate[]', type: 'text', with: 'context:visibility')
+        end
+
+        it 'has a field array with objects' do
           expect(page).to have_field('object[]', count: 6)
         end
       end

data/spec/features/resources/index_spec.rb

@@ -13,11 +13,8 @@ module DbdDataEngine
       ::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)
+        Dbd::Graph.any_instance.stub(:from_unsorted_CSV_file).
+          and_return(TestFactories::Graph.full)
       end
 
       context 'page content' do
@@ -30,9 +27,13 @@ module DbdDataEngine
           expect(page).to have_text('Resources')
         end
 
+        it 'does not show Contexts (only Facts)' do
+          expect(page).to_not have_text('context:visibility')
+        end
+
         it 'shows a test resource' do
-          expect(page).to have_text('foobar')
-          expect(page).to have_text('tuxping')
+          expect(page).to have_text('fact_predicate')
+          expect(page).to have_text('whooha')
         end
       end
     end

data/spec/features/resources/new_spec.rb

@@ -15,16 +15,28 @@ module DbdDataEngine
           visit(dbd_data_engine.new_resource_path)
         end
 
-        it 'talks about a new resource' do
-          expect(page.text).to match(/new resource/i)
-        end
+        context 'resource' do
+          it 'talks about a new resource' do
+            expect(page).to have_css('h1', text: 'Create a new resource')
+          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 select box array with schema:givenName as option' do
-          expect(page).to have_select('predicate[]', options: ['schema:givenName','schema:familyName'])
+          it 'has a field array' do
+            expect(page).to have_field('object[]')
+          end
         end
 
-        it 'has a field array' do
-          expect(page).to have_field('object[]')
+        context 'select a context' do
+          it 'has a label "context"' do
+            expect(page).to have_css('label', text: 'Context')
+          end
+
+          it 'has a select box for the context' do
+            expect(page).to have_select('context', [])
+          end
         end
       end
     end