officepod 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de93154e36e994448ce973761527fa299bbda34
-  data.tar.gz: f67266cba6a495996a8042d414f8acf41fd5bd23
+  metadata.gz: 7dc250293cdb6eb462abcf93ffce5471abad7200
+  data.tar.gz: e47f0c29771c73d0f5c4593524bae54fdd1713ed
 SHA512:
-  metadata.gz: b797312b7d74d07d2c6851120a5a8ea7850eeff186551febc5f1aaa4053fe83cb49b5d4e97dd37e1c197bf02d05fd2287dd7af32f76f57f156ec61a6ae3b2649
-  data.tar.gz: b9d44f53c85adf70a44f57a5981afd4c7f6f11fa244e8386d1df30261133d93b03ef69adbf667f483aeb050804008188e9d50dc35be70dd6731070890faa6c93
+  metadata.gz: 465f6f230bf90bb6a582116f3b0cf506c5e36d2e50c90bd580a22cf1fa0ada6ef593eb0937fc043fa58bc625bca2c3ba3f2a9520f8049561690aff5a52003913
+  data.tar.gz: 7baadc282cc5119fa66abed0e2803028071c61ffb0c3a8c9860d167992c68f3bf6d38eb095d5c9da2a334194d186722fd2a4995525f678ff8e84059d3b91ed88

data/lib/officepod/authentication.rb

@@ -1,13 +1,13 @@
 module Officepod
   module Authentication
     def self.included(base)
-      base.extend ClassMethods
+      base.send :include, InstanceMethods
     end
 
-    module ClassMethods
+    module InstanceMethods
       def login
         validates_body
-        response = self.post(@END_POINT, @options)
+        response = self.class.post(@END_POINT, @options)
         result = JSON.parse(response.parsed_response)
         cookie = get_cookie(response.headers["set-cookie"])
         result["SID"] = cookie
@@ -17,7 +17,7 @@ module Officepod
       end
 
       def logout
-        response = self.delete(@END_POINT, @options)
+        response = self.class.delete(@END_POINT, @options)
         response.parsed_response
       end
 

data/lib/officepod/bookmark.rb

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

data/lib/officepod/file.rb

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

data/lib/officepod/room.rb

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

data/lib/officepod/storage.rb

@@ -1,10 +1,10 @@
 module Officepod
   module Storage
     def self.included(base)
-      base.extend ClassMethods
+      base.send :include, InstanceMethods
     end
 
-    module ClassMethods
+    module InstanceMethods
       def storage_auth_list(lang: nil, cookie: nil)
         command = __method__.to_s
         @options[:command] = command
@@ -14,7 +14,7 @@ module Officepod
         }
         @options[:headers]["Cookie"] = "SID=#{cookie}"
         ipv4_pattern = /(?:[0-9]{1,3}\.){3}[0-9]{1,3}/
-        response = self.post("/server/request.php", @options)
+        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"

data/lib/officepod/version.rb

@@ -1,3 +1,3 @@
 module Officepod
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/officepod.rb

@@ -1,35 +1,39 @@
 module Officepod
   def self.included(base)
-    base.extend ClassMethods
-    base.class_eval do
+    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_POINT = "/server/request.php"
-
-      @options = {
-        command: "",
-        headers: {
-          "User-Agent" => "Gate4Mobile",
-          "Content-Type" => "application/x-www-form-urlencoded",
-          "Accept" => "application/json",
-          "Cookie" => ""
-        },
-        body: {}
-      }
     end
 
-    base.instance_eval do
-      extend Helper
+    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: {}
+        }
+      end
     end
+
   end
 
-  module ClassMethods
+  module InstanceMethods
     def officepod(options={command: "", body: "", cookie: ""})
       @options[:command] = options[:command]
       @options[:body] = options[:body]

data/spec/officepod_spec.rb

@@ -3,21 +3,36 @@ require 'spec_helper'
 describe Officepod do
   before(:each) do
     @klass = Class.new
-    @klass.instance_eval { include Officepod }
+    @klass.class_eval { include Officepod }
+    @instance = @klass.new
   end
 
-  it "has base_uri from HTTParty" do
-    expect(@klass.respond_to?(:base_uri)).to eq true
-  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 method" do
-    expect(@klass.respond_to?(:offciepod)).not_to be nil
+    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
 
-    it "should be success" do
+    it "should return hash resonse" do
       options = {
         command: "login",
         headers: {
@@ -36,12 +51,12 @@ describe Officepod do
         cookie: ""
       }
 
-      response = @klass.officepod(options)
+      response = @instance.officepod(options)
 
       expect(response.class).to eq Hash
     end
 
-    it "should have storage list" do
+    it "should have storage list as array" do
       expect(response["storage_list"].class).to eq Array
     end
 

metadata

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