triannon 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b04d335bf8e2b24385cfeb4088d9c8db62c5c8
-  data.tar.gz: e10c1dc27cd105c7acb4fee6de77f8f51dddac9e
+  metadata.gz: 9ae63ca110852324bb003e0a856033579b02cb62
+  data.tar.gz: ee6310ea307c6c25b33b5ddaa93f9f7a2a21aef6
 SHA512:
-  metadata.gz: 6f46652fb5c45b9b47be3374919eb4fd9bcf79ae50bf69059ee3896640990cedd11c499684185ea85d9befb6820c17ec8e6e84fc6425fbd7cef979dc57b6ef31
-  data.tar.gz: e3967493035299c17a6e7235f288e0b212738e94b9817806869fb4fb737bb6508e72c05607372718e6e84738ba85cca2d5597143ca723cf148457e2a003a6976
+  metadata.gz: 831eed11793f83aca689bde7eca9ef841615028b04cfa6806393390d072e31392a1d4c1af94a010b210e5f580c11564e4e070eb83261112db6098f329e6e3899
+  data.tar.gz: 3cb48b9ac9990ba2650b5753d6c9d6db9659c7409b3d5c8ee890b8ca14d61eeee2c44448c1d09396b3d254a204c5a9b3708a5f154433cc0260552b2b6a25e75c

data/app/controllers/triannon/annotations_controller.rb

@@ -42,7 +42,7 @@ module Triannon
 
     # POST /annotations/annotations
     def create
-      @annotation = Annotation.new(annotation_params)
+      @annotation = Annotation.new(:data => request.body.read)
 
       if @annotation.save
         redirect_to @annotation, notice: 'Annotation was successfully created.'
@@ -72,11 +72,6 @@ module Triannon
         @annotation = Annotation.find(params[:id])
       end
 
-      # Only allow a trusted parameter "white list" through.
-      def annotation_params
-        params.require(:annotation).permit(:data)
-      end
-
       def default_format_jsonld
         if ((!request.accept || request.accept.empty?) && (!params[:format] || params[:format].empty?))
           request.format = "jsonld"
@@ -96,7 +91,7 @@ module Triannon
           end
         end
       end
-      
+
       # handle Triannon::ExternalReferenceError
       def ext_ref_error(exception)
         render plain: exception.message, status: 403

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -255,7 +255,6 @@ files:
 - app/helpers/triannon/application_helper.rb
 - app/models/triannon/annotation.rb
 - app/models/triannon/annotation_ldp.rb
-- app/models/triannon/graph_validator.rb
 - app/services/triannon/ldp_creator.rb
 - app/services/triannon/ldp_destroyer.rb
 - app/services/triannon/ldp_loader.rb
@@ -299,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for working with storage of OpenAnnotations stored in Fedora4

data/app/models/triannon/graph_validator.rb

@@ -1,33 +0,0 @@
-module Triannon
-  class GraphValidator < ActiveModel::Validator
-    
-    def validate(anno)
-      graph_exists? anno
-      graph = anno.graph
-      basic_solution = graph.query(self.basic_query)
-      unless basic_solution && basic_solution.size == 1
-        anno.errors[:data] << 'The oa:Annotation class MUST be associated with each Annotation.'
-        anno.errors[:data] << 'each Annotation MUST have at least one target'
-      end      
-    end
-    
-    def graph_exists?(anno)
-      graph = anno.graph
-      unless graph && graph.size > 0
-        anno.errors[:data] << 'Unable to create non-null graph'
-      end
-    end
-    
-    # query for a subject with 
-    #  predicate  RDF::OpenAnnotation.hasTarget  
-    #  type of RDF::OpenAnnotation.Annotation
-    def self.basic_query
-      @@basic_query ||= begin
-        RDF::Query.new
-        basic_query << [:s, RDF.type, RDF::URI("http://www.w3.org/ns/oa#Annotation")]
-        basic_query << [:s, RDF::OpenAnnotation.hasTarget, nil]
-      end
-    end
-    
-  end
-end