officepod 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7351d432c54e9e0d80e2942962357677697724d0
-  data.tar.gz: 8da4d74c030d467fa002b7b0e76450776d04637d
+  metadata.gz: d755d4e4221e28c27bb61999216a64e48d8735ee
+  data.tar.gz: aff97b6d7cef96928fdf93fcfee93b95ba9dec87
 SHA512:
-  metadata.gz: df6fdefdddf22474d52f786b736680d14af93478b927fba5c244e336e6583824811d6d9b8eccb82b397ee7f4e95d6dbf4ebd3b3ecb61605333ff5788058295fb
-  data.tar.gz: 7fa1f4c1a7d7b518748b0da04963ab9874a58e3c1c6ddacc1b5d638b9fa27df47158fbce377e78397c80def3b9149fd90be3d51345b12a4bde28b665fd63ee08
+  metadata.gz: c078f037d370d3ff5a82328d1fddbcd7c8651c44f6ce61b35c7f89fe93c8e2d6c948314a4946f91028dbee14cd716a12fc3eee6a7dc0024fa14ce5bf42e23117
+  data.tar.gz: ce57682e0a5d19938b7836ffcb9883eb6e7ee5c7a6ef545b6c905094e1a66658adec226a2d7e5f78b49abd3bf7b1be7165a2ea4e4810d9cc298c2148345c53f9

data/README.md

@@ -34,14 +34,24 @@ class Api::UsersController < ApplicationController
   before_filter :user_params
 
   def login
-    response = officepod({command: "login", body: params[:user]})
+    body = {
+        'command': 'login',
+        'device_id': '',
+        'install_ver': '',
+        'ip': 'localhost:3000',
+        'lang': 'ko',
+        'str': 'dGVzdHtHU310ZXN0'
+    }
+    o = Officepod::Base.new("login", body)
+    response = o.operate
     respond_to do |format|
       format.json { render json: response, status: 200 }
     end
   end
 
   def logout
-    response = officepod({command: "logout"})
+    o = Officepod::Base.new("logout", body)
+    response = o.operate
     respond_to do |format|
       format.json { render json: response, status: 200 }
     end

data/lib/officepod.rb

@@ -1,56 +1,47 @@
+require "json"
+require "httparty"
+require "officepod/helper"
+require "officepod/exception"
+require "officepod/authentication"
+require "officepod/storage"
+require "officepod/bookmark"
+require "officepod/file"
+require "officepod/room"
+
 module Officepod
-  def self.included(base)
-    base.send :include, InstanceMethods
-
-    base.instance_eval do
-      include HTTParty
-      include Authentication
-      include Storage
-      include Bookmark
-      include File
-      include Room
-      include Helper
-
-      base_uri "http://g4m.lalaworks.com"
-    end
 
-    base.class_eval do
-      def initialize
-        @END_POINT = "/server/request.php"
-
-        @options = {
-          command: "",
-          headers: {
-            "User-Agent" => "Gate4Mobile",
-            "Content-Type" => "application/x-www-form-urlencoded",
-            "Accept" => "application/json",
-            "Cookie" => ""
-          },
-          body: {}
+  class Base
+    include HTTParty
+    include Authentication
+    include Helper
+    include Storage
+
+    base_uri "http://g4m.lalaworks.com"
+
+    def initialize(command=nil, body={}, cookie="")
+      options = {
+        headers: {
+          "User-Agent" => "Gate4Mobile",
+          "Content-Type" => "application/x-www-form-urlencoded",
+          "Accept" => "application/json"
         }
-      end
-    end
+      }
 
-  end
+      end_point = "/server/request.php"
+
+      self.instance_variable_set("@options", options)
+      self.instance_variable_set("@end_point", end_point)
+      self.instance_variable_set("@command", command)
+      @options[:body] = body unless body.empty?
+      @options[:headers]["Cookie"] = cookie unless cookie.empty?
 
-  module InstanceMethods
-    def officepod(options={command: "", body: "", cookie: ""})
-      @options[:command] = options[:command]
-      @options[:body] = options[:body]
-      @options[:headers]["Cookie"] ||= options[:cookie]
       validates_command
-      send(@options[:command])
     end
+
+    def operate
+      send(@command)
+    end
+
   end
 
 end
-
-require "json"
-require "httparty"
-require "officepod/helper"
-require "officepod/exception"
-require "officepod/authentication"
-require "officepod/storage"
-require "officepod/bookmark"
-require "officepod/file"
-require "officepod/room"

data/lib/officepod/authentication.rb

@@ -1,34 +1,26 @@
 module Officepod
   module Authentication
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-      def login
-        validates_body
-        response = self.class.post(@END_POINT, @options)
-        result = JSON.parse(response.parsed_response)
-        cookie = get_cookie(response.headers["set-cookie"])
-        result["SID"] = cookie
-        result["storage_list"] = storage_auth_list(lang: "ko", cookie: cookie)
-        result.delete_if { |k,v| ["result", "resultcode", "message"].include? k }
-        result
-      end
-
-      def logout
-        response = self.class.delete(@END_POINT, @options)
-        response.parsed_response
-      end
 
-      private
+    def login
+      validates_body
+      response = self.class.post(@end_point, @options)
+      result = JSON.parse(response.parsed_response)
+      cookie = get_cookie(response.headers["set-cookie"])
+      result["SID"] = cookie
+      result["storage_list"] = storage_auth_list(lang: "ko", cookie: cookie)
+      result.delete_if { |k,v| ["result", "resultcode", "message"].include? k }
+      result
+    end
 
-      def get_cookie(cookie)
-        sid_pattern = /(?!SID=)[a-z0-9]+(?=\;)/
-        result = cookie.match sid_pattern
-        result.to_s
-      end
+    def logout
+      response = self.class.delete(@end_point, @options)
+      response.parsed_response
     end
 
+    def get_cookie(cookie)
+      sid_pattern = /(?!SID=)[a-z0-9]+(?=\;)/
+      result = cookie.match sid_pattern
+      result.to_s
+    end
   end
 end

data/lib/officepod/bookmark.rb

@@ -1,11 +1,4 @@
 module Officepod
   module Bookmark
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-    end
-
   end
 end

data/lib/officepod/file.rb

@@ -1,11 +1,4 @@
 module Officepod
   module File
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-    end
-
   end
 end

data/lib/officepod/helper.rb

@@ -1,33 +1,31 @@
 module Officepod
   module Helper
+
     def validates_command
       if command_empty?
-        ::Kernel.raise EmptyCommand.new
+         raise Officepod::Exception::EmptyCommand.new
       else
         if unsupported_command?
-          ::Kernel.raise UnsupportedCommand.new(@options[:command])
+          raise Officepod::Exception::UnsupportedCommand.new(@command)
         end
       end
     end
 
     def validates_body
-      ::Kernel.raise EmptyBody.new if body_empty?
+      raise Officepod::Exception::EmptyBody.new if body_empty?
     end
 
     def unsupported_command?
-      !(self.class_methods.include? @options[:command].to_sym)
+      !(self.class.instance_methods.include?(@command.to_sym))
     end
 
     def command_empty?
-      @options[:command].empty?
+      @command.empty?
     end
 
     def body_empty?
       @options[:body].empty?
     end
 
-    def class_methods
-      self.methods - Object.methods
-    end
   end
 end

data/lib/officepod/room.rb

@@ -1,11 +1,4 @@
 module Officepod
   module Room
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-    end
-
   end
 end

data/lib/officepod/storage.rb

@@ -1,30 +1,23 @@
 module Officepod
   module Storage
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
 
-    module InstanceMethods
-      def storage_auth_list(lang: nil, cookie: nil)
-        command = __method__.to_s
-        @options[:command] = command
-        @options[:body] = {
-          "command": command,
-          "lang": lang
-        }
-        @options[:headers]["Cookie"] = "SID=#{cookie}"
-        ipv4_pattern = /(?:[0-9]{1,3}\.){3}[0-9]{1,3}/
-        response = self.class.post("/server/request.php", @options)
-        result = JSON.parse(response.parsed_response)
-        result["storagelist"].each do |e|
-          e["type"] = "FTP" if e["title"].include? "FTP"
-          e["type"] = "SMB" if e["title"].include? "SMB"
-          ip = e["filepath"].match ipv4_pattern
-          e["ip"]= ip.to_s
-        end
-        result["storagelist"]
+    def storage_auth_list(lang: nil, cookie: nil)
+      command = __method__.to_s
+      @options[:body] = {
+        "command": command,
+        "lang": lang
+      }
+      @options[:headers]["Cookie"] = "SID=#{cookie}"
+      ipv4_pattern = /(?:[0-9]{1,3}\.){3}[0-9]{1,3}/
+      response = self.class.post(@end_point, @options)
+      result = JSON.parse(response.parsed_response)
+      result["storagelist"].each do |e|
+        e["type"] = "FTP" if e["title"].include? "FTP"
+        e["type"] = "SMB" if e["title"].include? "SMB"
+        ip = e["filepath"].match ipv4_pattern
+        e["ip"]= ip.to_s
       end
+      result["storagelist"]
     end
-
   end
 end

data/lib/officepod/version.rb

@@ -1,3 +1,3 @@
 module Officepod
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/officepod_spec.rb

@@ -1,62 +1,34 @@
 require 'spec_helper'
+require 'json'
 
 describe Officepod do
   before(:each) do
     @klass = Class.new
-    @klass.class_eval { include Officepod }
-    @instance = @klass.new
-  end
-
-  context "Officepod class" do
-    it "has base_uri as a class method" do
-      expect(@klass.respond_to?(:base_uri)).to eq true
-    end
-
-    it "has officepod as an instance method" do
-      expect(@klass.instance_methods.include?(:officepod)).to eq true
-    end
-
-    it "has login as an instance method" do
-      expect(@klass.instance_methods.include?(:login)).to eq true
-    end
-
-    it "has @options instance variable" do
-      expect(@instance.instance_variable_defined?(:@options)).to eq true
-    end
-
-    it "has @END_POINT instance variable" do
-      expect(@instance.instance_variable_defined?(:@END_POINT)).to eq true
-    end
-  end
-
-  context "when login" do
-    response = nil
+    @klass.class_eval {
+      include Officepod
 
-    it "should return hash resonse" do
-      options = {
-        command: "login",
-        body: {
+      def login
+        body = {
             'command': 'login',
-            'device_id': '0000',
-            'install_ver': '1.0.10',
-            'ip': '192.168.1.4',
+            'device_id': '',
+            'install_ver': '',
+            'ip': 'localhost:3000',
             'lang': 'ko',
             'str': 'dGVzdHtHU310ZXN0'
         }
-      }
 
-      response = @instance.officepod(options)
-
-      expect(response.class).to eq Hash
-    end
+        o = Officepod::Base.new("login", body)
+        o.operate
+      end
+    }
+    @instance = @klass.new
+    @response = @instance.login
+  end
 
-    it "should have storage list as array" do
-      expect(response["storage_list"].class).to eq Array
+  context "login response" do
+    it "should have storage list" do
+      expect(@response["storage_list"]).not_to eq nil
     end
-
   end
 
-
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: officepod
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Yoochan Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json