titi 0.0.3 → 0.0.4

data/README.textile

@@ -43,8 +43,8 @@ Titi lets you write a straightforward and compact adaptor to activity stream for
           :published => created_at,
           :verb      => :post
           ) do |entry|
-          entry.author    = ActivityStreams::Author.new(user.name, user.url)
-          entry.object    = ActivityStreams::ActivityObject.adapt do |activity_obj|
+          entry.has_author user.name, user.url
+          entry.has_obj do |activity_obj|
             activity_obj.id        = id
             activity_obj.title     = text
             activity_obj.published = created_at

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/titi/adaptor.rb

@@ -18,33 +18,35 @@ module Titi
     # Adopt attributes from given hash, and programatically-set attributes from block
     #
     # @example
-    # ActivityStreams::Entry.adapt(
-    #   :id        => status.id,
-    #   :title     => status.text,
-    #   :content   => status.text,
-    #   :verb      => :post
-    #   ) do |entry|
-    #   status_time     = Time.parse(status.created_at) rescue nil
-    #   entry.published = status_time
-    #   entry.author    = ActivityStreams::Author.new(:name => status.user.name, :url => status.user.url)
-    #   entry.object    = ActivityStreams::Object.adapt do |activity_obj|
-    #     activity_obj.id        = status.id
-    #     activity_obj.title     = status.text
-    #     activity_obj.published = status_time
-    #     activity_obj.updated   = status_time
-    #     activity_obj.author    = ActivityStreams::Author.new(:name => status.user.name, :url => status.user.url)
-    #   end
-    # end
-    def adapt hsh={}, &block
-      self.attributes = hsh
+    #     ActivityStreams::Entry.adapt(
+    #       :id        => %Q{tag:twitter.com,2007:http://twitter.com/#{user.screen_name}/statuses/#{id}},
+    #       :title     => text,
+    #       :content   => text,
+    #       :published => created_at,
+    #       :verb      => :post
+    #       ) do |entry|
+    #       entry.has_author user.name, user.url
+    #       entry.has_obj do |activity_obj|
+    #         activity_obj.id        = id
+    #         activity_obj.title     = text
+    #         activity_obj.published = created_at
+    #         activity_obj.updated   = created_at
+    #         activity_obj.author    = entry.author
+    #       end
+    #     end
+    def adapt *args, &block
+      hsh = args.extract_options!
+      args_hsh = Hash.zip(self.members[0...args.length], args)
+      self.attributes = hsh.merge(args_hsh)
       yield self if block
     end
 
     # The standard hack to construct class methods on a class that #include's this model
     module ClassMethods
       # created an object and then adopts from the given hash and block
-      def adapt hsh={}, &block
-        obj = self.new
+      def adapt *args, &block
+        hsh = args.extract_options!
+        obj = self.new *args
         obj.adapt(hsh, &block)
         obj
       end

data/lib/titi/provider/activity_streams.rb

@@ -17,6 +17,23 @@ module Titi
           hsh = self.to_hash
           hsh.to_xml :root => self.class.to_s.underscore.gsub(%r{.*/},'')
         end
+
+        def has_thingy thingy, *args, &block
+          thingy_klass  = ('ActivityStreams::'+thingy.to_s.classify).constantize
+          thingy_setter = "#{thingy}="
+          p [thingy, thingy_klass, thingy_setter]
+          self.send(thingy_setter, thingy_klass.new) unless self.send(thingy)
+          self.send(thingy).adapt *args, &block
+          self.send(thingy)
+        end
+
+        def method_missing meth, *args, &block
+          if (meth.to_s =~ /has_(\w+)/) && (self.respond_to?("#{$1}="))
+            has_thingy $1, *args, &block
+          else
+            super
+          end
+        end
       end
 
       Feed = Struct.new(
@@ -26,9 +43,9 @@ module Titi
         include Titi::Adaptor
         include Titi::Provider::ActivityStreams::Common
 
-        def adapt objs
-          self.entry = objs.map do |obj|
-            obj.to_activity_stream_entry
+        def adapt thingys
+          self.entry = thingys.map do |thingy|
+            thingy.to_activity_stream_entry
           end
         end
       end
@@ -52,7 +69,7 @@ module Titi
         :author,            # author           {"name"=>["misterflip"], "uri"=>["http://profile.myspace.com/index.cfm?fuseaction=user.viewprofile&friendid=24601"]}
         :mood,              #
         :source,
-        :object,            # object
+        :obj,               # object
         :target             # target
         )
       Entry.class_eval do
@@ -78,9 +95,10 @@ module Titi
       end
       Author = Actor
 
-      # ActivityStream object
+      # ActivityStream object.
+      # We can't call them 'Object' (ruby has a class like that already :)
       #   http://activitystrea.ms/spec/1.0/atom-activity-01.html#activityobjectelement
-      ActivityObject = Struct.new(
+      Obj = Struct.new(
         :id,
         :title,
         :content,
@@ -92,7 +110,7 @@ module Titi
         :object_type,
         :vevent
         )
-      ActivityObject.class_eval do
+      Obj.class_eval do
         include Titi::Adaptor
         include Titi::Provider::ActivityStreams::Common
       end

data/lib/titi/provider/activity_streams/feed.xml.erb

@@ -0,0 +1,27 @@
+<feed>
+  <entry>
+    <title><%= entry.title %></title>
+    <content type="html"><%= entry.content %></content>
+    <id><%= entry.id %></id>
+    <published><%= entry.published %></published>
+    <updated  ><%= entry.updated   %></updated>
+    <link type="text/html"   rel="alternate" href="<%= entry.alt_link %>"/>
+    <link type="image/pjpeg" rel="image"     href="<%= entry.img_link %>"/>
+    <author>
+      <name><%= entry.author.name %></name>
+      <uri><%=  entry.author.url %></uri>
+    </author>
+    <activity:verb><%= entry.verb %></activity:verb>
+    <activity:object>
+      <id><%= entry.object.id %></id>
+      <title><%= entry.object.title %></title>
+      <link type="text/html" rel="alternate" href="<%= entry.object.alt_link %>"/>
+      <published><%= entry.object.published %></published>
+      <updated  ><%= entry.object.updated %></updated>
+      <author>
+        <name><%= entry.object.author.name %></name>
+        <uri ><%= entry.object.author.url  %></uri>
+      </author>
+    </activity:object>
+  </entry>
+</feed>

data/lib/titi/provider/twitter.rb

@@ -39,8 +39,8 @@ module Titi::Provider
           :published => created_at,
           :verb      => :post
           ) do |entry|
-          entry.author    = ActivityStreams::Author.new(user.name, user.url)
-          entry.object    = ActivityStreams::ActivityObject.adapt do |activity_obj|
+          entry.has_author user.name, user.url
+          entry.has_obj do |activity_obj|
             activity_obj.id        = id
             activity_obj.title     = text
             activity_obj.published = created_at

data/lib/titi/provider/twitter/models.rb

@@ -94,6 +94,7 @@ module Titi::Provider
       # virtual setter for user: If argument is not a Twitter::User, adapt it to
       # be a user (assuming it is a hash or a hash_like.
       def user= new_user
+        # return unless new_user
         new_user  = Twitter::User.adapt(new_user.to_hash) unless new_user.is_a?(Twitter::User)
         self[:user] = new_user
       end

data/titi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{titi}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mrflip"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/titi/provider.rb",
      "lib/titi/provider/README.textile",
      "lib/titi/provider/activity_streams.rb",
+     "lib/titi/provider/activity_streams/feed.xml.erb",
      "lib/titi/provider/tripit.rb",
      "lib/titi/provider/twitter.rb",
      "lib/titi/provider/twitter/models.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - mrflip
@@ -111,6 +111,7 @@ files:
 - lib/titi/provider.rb
 - lib/titi/provider/README.textile
 - lib/titi/provider/activity_streams.rb
+- lib/titi/provider/activity_streams/feed.xml.erb
 - lib/titi/provider/tripit.rb
 - lib/titi/provider/twitter.rb
 - lib/titi/provider/twitter/models.rb