muruca_widgets 0.2.4 → 0.2.6

data/lib/timeline_source.rb

@@ -158,31 +158,65 @@ class TimelineSource
       start_predicate = date_predicate_from_array(original_start_predicate, src)
       end_predicate = date_predicate_from_array(original_end_predicate, src)
 
+      # we expect to have a TaliaCore::SemanticCollectionWrapper for the dates
+      # if it's not the case, we create an array with the single value
+      if src[start_predicate].is_a? TaliaCore::SemanticCollectionWrapper
+        start_dates = src[start_predicate]
+      else
+        start_dates = [src[start_predicate]]
+      end
+
+      if src[end_predicate].is_a? TaliaCore::SemanticCollectionWrapper
+        end_dates = src[end_predicate]
+      else
+        end_dates = [src[end_predicate]]
+      end
+
+
       # Ignore all sources that do not have a timestamp
-      next if((stamp = src[start_predicate].first).blank?)
+      next if((stamp = start_dates.first).blank?)
       new_event = {}
       
       # Fill the start and end date fields
       dates = process_timestamp(stamp)
       # Overwrite the second date if we have a predefined "end" field
-      dates[1] = process_timestamp(src[end_predicate].first).first if(end_predicate) and !src[end_predicate].empty?
+      dates[1] = process_timestamp(end_dates.first).first unless end_dates.empty?
       new_event[:start], new_event[:end] = dates.collect { |d| to_iso8601(d) }
 
       update_first_last_year(dates)
       
       # Fill the title/description fields
-      new_event[:title] = src[@options[:title_property]].first || src[N::RDFS.label].first || N::URI.new(src.uri).to_name_s
-      new_event[:description] = src[@options[:description_property]].first || new_event[:title]
+
+      if (titles = src[@options[:title_property]]).is_a? TaliaCore::SemanticCollectionWrapper and !titles.empty?
+        title = titles.first
+      else
+        title = titles unless titles.nil?
+        title = src[N::RDFS.label].first if title.nil?
+        title = N::URI.new(src.uri).to_name_s if title.nil?
+      end
+
+#      src[@options[:title_property]].first || src[N::RDFS.label].first || N::URI.new(src.uri).to_name_s
+
+      if (descriptions = src[@options[:description_property]]).is_a? TaliaCore::SemanticCollectionWrapper and !descriptions.empty?
+        description = descriptions.first
+      else
+        description = descriptions unless descriptions.nil?
+        description = title if description.nil?
+      end
+
+
+      new_event[:title] = title
+      new_event[:description] = description
       # new_event['image'] = ''
       # The link field may either be filled from a property, or with a link to the element itself (default)
       new_event[:link] = if(@options[:link_property])
         src[@options[:link_property]].first || ''
       else
-        if((uri = src.to_uri).local?)
-          '/' << uri.local_name
-        else
-          uri.to_s
-        end
+#        if((uri = src.to_uri).local?)
+#          '/' << uri.local_name
+#        else
+          src.to_uri.to_s
+#        end
       end
       # We have a duration event if we have a non-nil end date
       new_event[:duration_event] = true unless(new_event[:end])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: muruca_widgets
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  prerelease: false
+  segments: 
+    - 0
+    - 2
+    - 6
+  version: 0.2.6
 platform: ruby
 authors: 
   - Daniel Hahn
@@ -9,10 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +02:00
+date: 2010-11-29 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 1
+              - 0
+            version: 1.1.0
+    type: :runtime
+    version_requirements: *id001
 description: Some additional interface elements to be used on Muruca sites.
 email: ghub@limitedcreativity.org
 executables: []
@@ -209,18 +227,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Additional interface elements for Muruca Sites.