Switch to ActiveResource.

lib/freckle-gem/entry.rb

@@ -1,33 +1,18 @@
 require 'json'
+require 'activeresource'
 
 module FreckleGem
 
-  class Entry
-    @@attributes = [:minutes, :project, :description, :user, :date].freeze
-    @@attributes.each do |a|
-      attr_accessor a
-    end
-
-    def self.new
-      e = super
-      e.date = Date.today
-      e
-    end
+  class Entry < ActiveResource::Base
+    self.site = "http://#{Freckle::AppConfig.subdomain}.#{Freckle::AppConfig.host}:#{Freckle::AppConfig.port}/api/"
 
-    def self.from_options(options)
-      @@attributes.inject(Entry.new) do |e, a|
-        e.send("#{a}=", options[a]) if options[a]; e
-      end
+    def self.headers
+      @headers ||= { 'X_FRECKLETOKEN' => Freckle::AppConfig.authtoken }
     end
 
     def attributes
-      @@attributes.inject({}) do |h, a|
-        h[a] = self.send(a); h
-      end
+      { :date => Date.today }.merge(@attributes || {})
     end
 
-    def to_json
-      { :entry => self.attributes }.to_json
-    end
   end
 end

lib/freckle-gem/project.rb

@@ -2,26 +2,11 @@
 
 module FreckleGem
 
-  class Project
-    @@attributes = [:id, :name].freeze
-    @@attributes.each do |a|
-      attr_accessor a
-    end
-
-    def self.from_options(options)
-      @@attributes.inject(Project.new) do |e, a|
-        e.send("#{a}=", options[a]) if options[a]; e
-      end
-    end
-
-    def attributes
-      @@attributes.inject({}) do |h, a|
-        h[a] = self.send(a); h
-      end
-    end
+  class Project < ActiveResource::Base
+    self.site = "http://#{Freckle::AppConfig.subdomain}.#{Freckle::AppConfig.host}:#{Freckle::AppConfig.port}/api/"
 
-    def to_json
-      { :project => self.attributes }.to_json
+    def self.headers
+      @headers ||= { 'X_FRECKLETOKEN' => Freckle::AppConfig.authtoken }
     end
   end
 end

lib/freckle/cli.rb

@@ -38,19 +38,8 @@ def self.execute(stdout, arguments=[])
         end
       end
 
-      entry = FreckleGem::Entry.from_options(options.merge(:user => Freckle::AppConfig.user))
-      response = send_request(entry.to_json)
-      case response
-      when Net::HTTPSuccess
-        puts response.body
-      else
-        puts "Failed to create entry."
-      end
-    end
-
-    def self.send_request(data)
-      http = Net::HTTP.new("#{Freckle::AppConfig.subdomain}.#{Freckle::AppConfig.host}", Freckle::AppConfig.port)
-      http.post("/api/entries.json?token=#{Freckle::AppConfig.authtoken}", data, { 'Content-Type' => 'application/json' })
+      entry = FreckleGem::Entry.new(options.merge(:user => Freckle::AppConfig.user))
+      entry.save
     end
   end
 end