towsta 1.2.2 → 1.2.3

data/lib/towsta/kinds/gallery.rb

@@ -14,6 +14,12 @@ module Towsta
         end
       end
 
+      def export
+        string = '['
+        @content.each {|con| string << "#{con.to_s},"}
+        "#{string[0..-2]}]"
+      end
+
     end
 
   end

data/lib/towsta/kinds/image.rb

@@ -4,6 +4,7 @@ module Towsta
     class ImageKind < MainKind
 
       def set content
+        return @content = content if content.class == Bresson::ImageReference
         begin
           @content = Bresson::ImageReference.new JSON.parse(content[1..-2], :symbolize_names => true)
         rescue
@@ -11,6 +12,11 @@ module Towsta
         end
       end
 
+      def export
+        return '' if @content.nil?
+        "(#{@content.to_s})"
+      end
+
     end
 
   end

data/lib/towsta/kinds/video.rb

@@ -0,0 +1,22 @@
+module Towsta
+  module Kinds
+
+    class VideoKind < MainKind
+
+      def set content
+        return @content = content if content.class == Cameraman::VideoReference
+        begin
+          @content = Cameraman::VideoReference.new JSON.parse(content, :symbolize_names => true)
+        rescue
+          @content = nil
+        end
+      end
+
+      def compare object
+        @content.to_s == object.to_s
+      end
+
+    end
+
+  end
+end

data/lib/towsta/version.rb

@@ -1,3 +1,3 @@
 module Towsta
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/towsta.rb

@@ -8,6 +8,7 @@ require 'time'
 require 'date'
 require 'time'
 require 'bresson'
+require 'cameraman'
 require 'sinatra'
 require 'compass'
 
@@ -32,6 +33,8 @@ require File.expand_path('../towsta/kinds/password', __FILE__)
 require File.expand_path('../towsta/kinds/text', __FILE__)
 require File.expand_path('../towsta/kinds/user', __FILE__)
 require File.expand_path('../towsta/kinds/vertical', __FILE__)
+require File.expand_path('../towsta/kinds/video', __FILE__)
+require File.expand_path('../towsta/kinds/multiple', __FILE__)
 
 Dir["./controllers/*.rb"].each {|file| require file}
 
@@ -47,9 +50,7 @@ def sync_with_towsta params=nil
   else
     Towsta::Synchronizer.new :secret => $towsta_secret, :path => $towsta_path, :params => params
   end
-  begin
-    Dir["./models/*.rb"].each {|file| load file }
-  rescue; end;
+  Dir["./models/*.rb"].each {|file| load file }
 end
 
 def clear_sync

data/towsta.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency("compass")
   s.add_dependency("haml")
   s.add_dependency("sinatra")
+  s.add_dependency("cameraman")
   s.add_dependency("shotgun")
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Mortaro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 -02:00
+date: 2011-11-27 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shotgun
+  name: cameraman
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -108,6 +108,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: Simply integrates the towsta api
 email: 
 - mortaro@towsta.com
@@ -135,10 +148,12 @@ files:
 - lib/towsta/kinds/list.rb
 - lib/towsta/kinds/main.rb
 - lib/towsta/kinds/money.rb
+- lib/towsta/kinds/multiple.rb
 - lib/towsta/kinds/password.rb
 - lib/towsta/kinds/text.rb
 - lib/towsta/kinds/user.rb
 - lib/towsta/kinds/vertical.rb
+- lib/towsta/kinds/video.rb
 - lib/towsta/login.rb
 - lib/towsta/memory.rb
 - lib/towsta/sinatra_extension.rb