abrupt 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582de82907913af777a1bf2c35ccd82918d66454
-  data.tar.gz: 54c49d2a91bb8e91148ef7a75190a49c7ed33315
+  metadata.gz: dfa91b55285d5f4c8443a962506e11bb027cded2
+  data.tar.gz: d79ad95acdf78a381f4a82d4d3ef1117a7ff2d45
 SHA512:
-  metadata.gz: c6a4a584197c07c8a16bbbbbfccb6b827c741d946848dbd00c553ea951a68ea5d933bdc3d3baa07c3ea8dacb6ff1d625fea8020d4d557c6bc096eb5caed6b33f
-  data.tar.gz: 33a07d4e899c761cf956f8ac7b74d019a81f703c33a124a00bcb1c18e2b6e61e3ba2c9bcdf17c5d8f057e8fba1869bce5fb48215d9462419e4d84e52eff74d6c
+  metadata.gz: 7a8777dea0a494156fd8d6ed4e96eebe2245d70620b915e52483a80d4a960b0d411d3c31fd72d84ef0332adcf62f787ac632bdcb399b6971a81bfe3c2c557077
+  data.tar.gz: 59475021e5ead1a628c64244ae194131eae9ab718c98de664ea24bf881038ec6c51fa7dc9682aedc9cd7ee1117f6f8e3df499b47b023d101e0534ad58f939456

data/abrupt.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name = 'abrupt'
   spec.version = Abrupt::VERSION
   spec.authors = ['Manuel Dudda']
-  spec.email = ['dudda@paij.de']
+  spec.email = ['manuel.dudda@gmail.com']
   spec.summary = 'Tools for the AbRUPt project.'
   spec.description = 'Tools for the AbRUPt project.'
   spec.homepage = 'https://github.com/manuel84/abrupt'

data/assets/voc/tbox.ttl

@@ -495,26 +495,6 @@
 
 
 
-###  http://wba.cs.hs-rm.de/AbRUPt/paragrahpsWithTooLongLines
-
-:paragrahpsWithTooLongLines rdf:type owl:DatatypeProperty ;
-                            
-                            rdfs:domain :Page ;
-                            
-                            rdfs:range xsd:integer .
-
-
-
-###  http://wba.cs.hs-rm.de/AbRUPt/textNodesWithLowContrast
-
-:textNodesWithLowContrast rdf:type owl:DatatypeProperty ;
-                          
-                          rdfs:domain :Page ;
-                          
-                          rdfs:range xsd:integer .
-
-
-
 ###  http://wba.cs.hs-rm.de/AbRUPt/bigwords
 
 :bigwords rdf:type owl:DatatypeProperty ;
@@ -1015,6 +995,16 @@
 
 
 
+###  http://wba.cs.hs-rm.de/AbRUPt/paragrahpsWithTooLongLines
+
+:paragrahpsWithTooLongLines rdf:type owl:DatatypeProperty ;
+                            
+                            rdfs:domain :Page ;
+                            
+                            rdfs:range xsd:integer .
+
+
+
 ###  http://wba.cs.hs-rm.de/AbRUPt/phpsessionid
 
 :phpsessionid rdf:type owl:DatatypeProperty ;
@@ -1063,16 +1053,6 @@
 
 
 
-###  http://wba.cs.hs-rm.de/AbRUPt/ratios
-
-:ratios rdf:type owl:DatatypeProperty ;
-        
-        rdfs:domain :Page ;
-        
-        rdfs:range xsd:string .
-
-
-
 ###  http://wba.cs.hs-rm.de/AbRUPt/readability
 
 :readability rdf:type owl:DatatypeProperty ;
@@ -1193,6 +1173,16 @@
 
 
 
+###  http://wba.cs.hs-rm.de/AbRUPt/textNodesWithLowContrast
+
+:textNodesWithLowContrast rdf:type owl:DatatypeProperty ;
+                          
+                          rdfs:domain :Page ;
+                          
+                          rdfs:range xsd:integer .
+
+
+
 ###  http://wba.cs.hs-rm.de/AbRUPt/textReadingTime
 
 :textReadingTime rdf:type owl:DatatypeProperty ;
@@ -1257,7 +1247,7 @@
                
                rdfs:domain :Visit ;
                
-               rdfs:range xsd:decimal .
+               rdfs:range xsd:double .
 
 
 

data/bin/abrupt

@@ -15,7 +15,7 @@ class AbruptApp
 
     command :crawl do |c|
       c.syntax = 'abrupt crawl [options]'
-      c.description = 'Crawls a website'
+      c.description = 'Crawls a website [BETA!]'
       c.option '-nofollow', "don't follow links"
       c.option '--lang STRING', String, 'language'
       c.option '--services STRING', Array, 'riscpl'
@@ -27,7 +27,7 @@ class AbruptApp
     end
 
     command :convert do |c|
-      c.syntax = 'abrupt convert src_crawled_data src_user_data [options]'
+      c.syntax = 'abrupt convert src_crawled_data [src_user_data] [options]'
       c.description = 'Converts and merges xml files to owl'
       c.option '--format STRING', String, 'Specifies the output format, possible [turtle|rdfxml|ntriples] (default=turtle)'
       c.option '--output STRING', String, 'Specifies an output file'

data/lib/abrupt.rb

@@ -7,11 +7,11 @@ require 'pp'
 # Extension for String class
 class String
   def remove_last_slashes
-    gsub(/([\/]*)$/, '')
+    gsub(%r{([\/]*)$}, '')
   end
 
   def append_last_slash
-    gsub(/([^\/])$/, '\1/')
+    gsub(%r{([^\/])$}, '\1/')
   end
 end
 
@@ -75,7 +75,8 @@ module Abrupt
   def self.convert(file, *args)
     converter = Converter.instance
     assertions = args.last[:assertions].split ','
-    converter.init(args[1]) # options
+    assertions.delete 'website' if args.count <= 1
+    converter.init(args.last) # options
     append file, args.first, assertions
     converter.result
   end

data/lib/abrupt/converter.rb

@@ -110,8 +110,7 @@ module Abrupt
         time = ::Abrupt.format_time(page[:entertime])
         Transformation::Client::Base.subclasses.each do |transformer_class|
           transformer = transformer_class.new(visitor.parent_uri + visitor.uri,
-                                              ['Visit', time], page
-          )
+                                              ['Visit', time], page)
           add_to_result transformer.add_individuals
         end
       end

data/lib/abrupt/transformation/client/visit.rb

@@ -57,8 +57,8 @@ module Abrupt
           leavetime = Abrupt.parse_time(@values[:leavetime])
           enterteime = Abrupt.parse_time(@values[:entertime])
           return unless leavetime && enterteime # maybe no recognized leavetime
-          visit_duration = (leavetime - enterteime).to_f # in seconds
-          add_data_property('visitDuration', visit_duration)
+          visit_duration = (leavetime - enterteime).to_f.round(8) # in seconds
+          add_data_property('visitDuration', visit_duration) if visit_duration > 0.0
         end
       end
     end

data/lib/abrupt/transformation/website/complexity.rb

@@ -12,6 +12,7 @@ module Abrupt
           @values[keyname][:vicramComplexity] =
               @values[keyname][:vicram].delete(:complexity)
           add_contrast_properties
+          add_ratio_properties
           @values[keyname].delete :vicram
           super
         end
@@ -24,6 +25,24 @@ module Abrupt
           end
           @values[keyname].delete :contrast
         end
+
+        def add_ratio_properties
+          ratios = @values[keyname].delete :ratios
+          add_page_sizes(ratios[:pageSize]) if ratios[:pageSize]
+          add_img_tag_infos(ratios[:img_Tag]) if ratios[:img_Tag]
+        end
+
+        def add_page_sizes(page_size)
+          page_size.each do |type, value|
+            add_data_property(type, value)
+          end
+        end
+
+        def add_img_tag_infos(img_tag)
+          img_tag.each do |type, value|
+            add_data_property(type, value)
+          end
+        end
       end
     end
   end

data/lib/abrupt/version.rb

@@ -3,5 +3,5 @@
 # The version number of the abprubt gem
 # @abstract
 module Abrupt
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/transformation/website/complexity_spec.rb

@@ -3,9 +3,9 @@ require_relative '../base_spec'
 describe Abrupt::Transformation::Website::Complexity do
   it_should_behave_like 'convertable object' do
     let(:expected_values) do
-      [{ contrast: { _1: { A_tag_With_Low_Contrast: '0',
-                           TextNodes_With_Low_Contrast: '0',
-                           paragrahps_with_too_long_lines: '0' } },
+      [{ contrast: { _1: { A_tag_With_Low_Contrast: 0,
+                           TextNodes_With_Low_Contrast: 0,
+                           paragrahps_with_too_long_lines: 0 } },
          vizweb: { numberOfLeaves: 1,
                    textArea: '0',
                    numberOfTextGroups: 0,
@@ -93,9 +93,9 @@ describe Abrupt::Transformation::Website::Complexity do
                    img_Tag: { img_Area_in_pixel_squared: 2730,
                               img_document_tag_percentage: 0.94267955801105,
                               img_document_tag_ratio: 106.08058608059 } } },
-       { contrast: { _1: { A_tag_With_Low_Contrast: '0',
-                           TextNodes_With_Low_Contrast: '0',
-                           paragrahps_with_too_long_lines: '0' } },
+       { contrast: { _1: { A_tag_With_Low_Contrast: 1,
+                           TextNodes_With_Low_Contrast: 1,
+                           paragrahps_with_too_long_lines: 0 } },
          vizweb: { numberOfLeaves: 17,
                    textArea: '0.0074666341145833',
                    numberOfTextGroups: 1,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abrupt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Manuel Dudda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -292,7 +292,7 @@ dependencies:
         version: '4.5'
 description: Tools for the AbRUPt project.
 email:
-- dudda@paij.de
+- manuel.dudda@gmail.com
 executables:
 - abrupt
 extensions: []
@@ -409,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Tools for the AbRUPt project.