nov-smartfm 1.0.0 → 1.0.2

data/ChangeLog

@@ -39,9 +39,13 @@
 
 == 0.3.1
 
-* add sessions API support
+* add sessions API calls
 * fixed extract API bugs
 
 == 0.4.0
 
-* OAuth DELETE calls works fine now.
+* OAuth DELETE calls works fine now.
+
+== 1.0.0
+
+* add friends, followers, likes and notifications API calls

data/lib/smartfm/core/version.rb

@@ -1,7 +1,7 @@
 module Smartfm::Version
   MAJOR = 1
   MINOR = 0
-  REVISION = 0
+  REVISION = 2
   class << self
     def to_version
       "#{MAJOR}.#{MINOR}.#{REVISION}"

data/lib/smartfm/models/list.rb

@@ -1,6 +1,6 @@
 class Smartfm::List < Smartfm::Base
   ATTRIBUTES = [:id, :title, :description, :icon, :square_icon, :item_count, :user_count, :iknow, :dictation, :brainspeed,
-                :language, :translation_language, :list_type, :transcript, :embed, :tags, :media_entry,
+                :language, :translation_language, :item_type, :transcript, :embed, :tags, :media_entry,
                 :attribution_license_id, :items, :sentences, :user]
   READONLY_ATTRIBUTES = [:id, :icon, :item_count, :user_count, :iknow, :dictation, :brainspeed, :user]
   attr_accessor *(ATTRIBUTES - READONLY_ATTRIBUTES)
@@ -50,7 +50,7 @@ class Smartfm::List < Smartfm::Base
       @dictation  = Application.new(common_settings.merge(:dictation  => params[:dictation]))
       @brainspeed = Application.new(common_settings.merge(:brainspeed => params[:brainspeed]))
     end
-    @list_type   = params[:list_type]   # for list creation
+    @item_type   = params[:item_type]   # for list creation
     @transcript  = params[:transcript]  # for list creation
     @embed       = params[:embed]       # for list creation
     @tags        = params[:tags]        # for list creation
@@ -72,7 +72,8 @@ class Smartfm::List < Smartfm::Base
   end
 
   def add_item(auth, item)
-    self.rest_client.add_item(auth, {:id => self.id, :item_id => item.id})
+    # id is used for item_id only here..
+    self.rest_client.add_item(auth, {:list_id => self.id, :id => item.id})
   end
 
   def delete_item(auth, item)
@@ -90,10 +91,7 @@ class Smartfm::List < Smartfm::Base
       'list[translation_language]' => self.translation_language || 'ja'
     }
     # Optional attributes
-    if self.list_type
-      post_data['list[type]'] = self.list_type
-    end
-    [:transcript, :embed, :tags, :media_entry, :author, :author_url, :attribution_license_id ].each do |key|
+    [:transcript, :embed, :tags, :item_type].each do |key|
       if self.send("#{key}")
         post_data["list[#{key}]"] = self.send("#{key}")
       end

data/lib/smartfm/models/notification.rb

@@ -17,7 +17,7 @@ class Smartfm::Notification < Smartfm::Base
     @context   = params[:context]
   end
 
-  private
+  protected
 
   def to_post_data
     {:message => self.message}

data/lib/smartfm/modules/acts_as_likable.rb

@@ -5,11 +5,11 @@ module Smartfm::ActsAsLikable
     self.deserialize(hash, :as => Smartfm::Like) || []
   end
 
-  def like!(auth, params)
+  def like!(auth, params = {})
     self.rest_client.like!(auth, params.merge(:id => self.id))
   end
 
-  def unlike!(auth, params)
+  def unlike!(auth, params = {})
     self.rest_client.unlike!(auth, params.merge(:id => self.id))
   end
 

data/lib/smartfm/modules/private_content.rb

@@ -12,7 +12,7 @@ module Smartfm::PrivateContent
     end
 
     def create(auth, params = {})
-      self.new(params).save
+      self.new(params).save(auth)
     end
   end
 

data/lib/smartfm/modules/public_content.rb

@@ -11,8 +11,8 @@ module Smartfm::PublicContent
       self.deserialize(hash) || []
     end
 
-    def find(list_id, params = {})
-      params[:id] = list_id
+    def find(obj_id, params = {})
+      params[:id] = obj_id
       hash = self.rest_client.find(params)
       self.deserialize(hash)
     end
@@ -34,12 +34,15 @@ module Smartfm::PublicContent
 
   module InstanceMethods
     def save(auth)
-      begin
-        obj_id = self.rest_client.create(auth, self.to_post_data)
-      rescue
-        return false
+      result = self.rest_client.create(auth, self.to_post_data)
+      case result
+      when Hash
+        self.deserialize(result)
+      when String
+        self.class.find(result)
+      else
+        true
       end
-      self.find(obj_id)
     end
 
     def delete(auth)

data/lib/smartfm/rest_clients/base.rb

@@ -147,18 +147,18 @@ class Smartfm::RestClient::Base
     case auth.mode
     when :oauth
       response = auth.auth_token.get(path, http_header)
-      handle_rest_response(response, :text)
+      handle_rest_response(response, :json)
     when :basic_auth
       http_connect do
         get_req = Net::HTTP::Get.new(path, http_header)
         get_req.basic_auth(auth.account.username, auth.account.password)
-        [get_req, :text]
+        [get_req, :json]
       end
     end
   end
 
   def self.http_post(auth, path, params = {})
-    self.api_key_required
+    api_key_required
     params.merge!(:api_key => self.config.api_key)
     case auth.mode
     when :oauth
@@ -175,7 +175,7 @@ class Smartfm::RestClient::Base
   end
 
   def self.http_delete(auth, path, params = {})
-    self.api_key_required
+    api_key_required
     params.merge!(:api_key => self.config.api_key)
     path = "#{path}?#{params.to_http_str}"
     case auth.mode

data/lib/smartfm/rest_clients/list.rb

@@ -8,7 +8,7 @@ class Smartfm::RestClient::List < Smartfm::RestClient::Base
     :matching    => {:path => '/lists/matching/__keyword__'},
     :likes       => {:path => '/lists/__id__/likes'        },
     :create      => {:path => '/lists',                          :http_method => :post},
-    :add_item    => {:path => '/lists/__id__/items',             :http_method => :post},
+    :add_item    => {:path => '/lists/__list_id__/items',        :http_method => :post}, # id is used for item_id here..
     :like!       => {:path => '/lists/__id__/likes',             :http_method => :post},
     :delete      => {:path => '/lists/__id__',                   :http_method => :delete},
     :delete_item => {:path => '/lists/__id__/items/__item_id__', :http_method => :delete},

data/lib/smartfm/rest_clients/user.rb

@@ -13,8 +13,8 @@ class Smartfm::RestClient::User < Smartfm::RestClient::Base
     :notifications        => {:path => '/users/__username__/notifications'},
     :matching             => {:path => '/users/matching/__keyword__'      },
     :study_results        => {:path => '/users/__username__/study_results/__application__'},
-    :follow!              => {:path => '/users/__username__/friends', :http_method => :post},
-    :unfollow!            => {:path => '/users/__username__/friends', :http_method => :delete}
+    :follow!              => {:path => '/friends',              :http_method => :post},
+    :unfollow!            => {:path => '/friends/__username__', :http_method => :delete}
   }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nov-smartfm
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors: 
 - nov
@@ -54,22 +54,22 @@ files:
 - spec/smartfm/core/auth_spec.rb
 - spec/smartfm/core/config_spec.rb
 - spec/smartfm/core/version_spec.rb
-- spec/smartfm/model
-- spec/smartfm/model/base_spec.rb
-- spec/smartfm/model/item_spec.rb
-- spec/smartfm/model/like_spec.rb
-- spec/smartfm/model/list_spec.rb
-- spec/smartfm/model/notification_spec.rb
-- spec/smartfm/model/sentence_spec.rb
-- spec/smartfm/model/user_spec.rb
-- spec/smartfm/rest_client
-- spec/smartfm/rest_client/base_spec.rb
-- spec/smartfm/rest_client/item_spec.rb
-- spec/smartfm/rest_client/like_spec.rb
-- spec/smartfm/rest_client/list_spec.rb
-- spec/smartfm/rest_client/notification_spec.rb
-- spec/smartfm/rest_client/sentence_spec.rb
-- spec/smartfm/rest_client/user_spec.rb
+- spec/smartfm/models
+- spec/smartfm/models/base_spec.rb
+- spec/smartfm/models/item_spec.rb
+- spec/smartfm/models/like_spec.rb
+- spec/smartfm/models/list_spec.rb
+- spec/smartfm/models/notification_spec.rb
+- spec/smartfm/models/sentence_spec.rb
+- spec/smartfm/models/user_spec.rb
+- spec/smartfm/rest_clients
+- spec/smartfm/rest_clients/base_spec.rb
+- spec/smartfm/rest_clients/item_spec.rb
+- spec/smartfm/rest_clients/like_spec.rb
+- spec/smartfm/rest_clients/list_spec.rb
+- spec/smartfm/rest_clients/notification_spec.rb
+- spec/smartfm/rest_clients/sentence_spec.rb
+- spec/smartfm/rest_clients/user_spec.rb
 - spec/spec_helper.rb
 - lib/ext
 - lib/ext/hash.rb