cuenote-api 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c05978f4eae76bf5e6551cc0ff22708660181b7
-  data.tar.gz: 28dc1aa67c1699bea0ff69e8659221a7a811740a
+  metadata.gz: e13e1ff0ab47c0b200e4b8b142b694b47f70d0e2
+  data.tar.gz: f794e4f57ef44556995fb4d4a3e55b3382fc570e
 SHA512:
-  metadata.gz: b40ce7a2f5c0ebe119b6deed77992f29e4d23871c4a77a939a72593f98084f621b32bc725d3d43a254aa2c0620e29a1f68994a8235d03e818fb1ce710ffd08e5
-  data.tar.gz: 5e2167e668a65903b5a3e8a3061c6aa2741478b556cd668439c88c2dce8a0988937494804b64b89e0e98034677b82ad154787afcd0441e3c4a3a014dfeb063f0
+  metadata.gz: 96101fff168ed0d3f4a471eef16db2d6c7b6e3c84afe2bace5dc44bbb5ddd769c8a058162ac03e6786d6c69ff23ee32165e44033114697fa4fbc203879e71176
+  data.tar.gz: 361e5b1b967724b89cc18c83dc22325efb6d95795b379ca0652735161d5014590747f5628d56910a03fbc89adfffde38b98e388d09c2b4c46fcedb423bffc532

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.env

data/cuenote-api.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "dotenv"
 end

data/lib/cuenote/api.rb

@@ -1,12 +1,14 @@
 require "cuenote/api/version"
+
+# Config
 require "cuenote/api/config"
-require "cuenote/api/xml_builder"
-require "cuenote/api/request"
-require "cuenote/api/response"
-require "cuenote/api/import"
 
-module Cuenote
-  module Api
-    # Your code goes here...
-  end
-end
+# Utility
+require "cuenote/api/command"
+require "cuenote/api/connection"
+require "cuenote/api/node"
+
+# Api Object
+require "cuenote/api/address_book"
+require "cuenote/api/address"
+require "cuenote/api/import"

data/lib/cuenote/api/address.rb

@@ -0,0 +1,20 @@
+require "cuenote-api"
+
+module Cuenote::Api
+  class Address
+    def initialize(element=nil)
+      @element = element
+      # @adbook = element.attributes[:adbook]
+    end
+
+    # TODO
+    def update
+      run 'editAddress'
+    end
+
+    # TODO
+    def delete
+      run 'deleteAddress'
+    end
+  end
+end

data/lib/cuenote/api/address_book.rb

@@ -0,0 +1,50 @@
+require "cuenote/api/node"
+
+module Cuenote::Api
+  class AddressBook < Node
+    def initialize(doc=nil)
+      super doc
+      @adbook = attributes[:adbook]
+      puts doc.class
+    end
+
+    def self.list
+      res = run 'getAdBookList'
+      res.elements.map do |element|
+        AddressBook.new(element)
+      end
+    end
+
+    # TODO
+    def self.create
+    end
+
+    # TODO
+    def update
+    end
+
+    # TODO
+    def delete
+    end
+
+    # TODO
+    def information
+    end
+
+    # TODO
+    def addresses
+    end
+
+    # TODO
+    def add
+    end
+
+    # TODO
+    def select
+    end
+
+    def import
+      @import ||= Import.new(adbook: @adbook)
+    end
+  end
+end

data/lib/cuenote/api/base.rb

@@ -1,11 +1,22 @@
-require "cuenote/api/request"
-require "cuenote/api/response"
+require "cuenote/api/command"
 require "cuenote/api/connection"
 
 module Cuenote::Api
   class Base
-    def connection
-      Connection.new
+    def self.connection(command)
+      Connection.new(command)
+    end
+
+    def self.run(command, params={})
+      connection(Command.new(command, params)).response
+    end
+
+    def connection(command)
+      self.class.connection command
+    end
+
+    def run(command, params={})
+      self.class.run command, params
     end
   end
 end

data/lib/cuenote/api/command.rb

@@ -0,0 +1,36 @@
+require "builder"
+
+module Cuenote::Api
+  class Command
+    def initialize(command, params={})
+      @command, @params = [command, params]
+    end
+
+    def builder
+      @builder ||= ::Builder::XmlMarkup.new
+    end
+
+    def build(id)
+      build_command @command, id, @params
+    end
+
+    private
+
+    def build_command command, id, params
+      options = {}
+      options[:id] = id if id
+      options[:command] = command
+      if params && params.size > 0
+        builder.execute options do |exec|
+          exec.parameter do |parameter|
+            params.each do |key, val|
+              eval "parameter.#{key} \"#{val}\""
+            end
+          end
+        end
+      else
+        builder.execute options
+      end
+    end
+  end
+end

data/lib/cuenote/api/config.rb

@@ -10,7 +10,7 @@ module Cuenote::Api
 
     def method_missing name, value=nil
       if value
-        set name, value
+        set name.to_s.gsub(/=/, ''), value
       else
         get name
       end

data/lib/cuenote/api/connection.rb

@@ -1,11 +1,66 @@
+require "net/http"
+require "builder"
+
+require "cuenote/api/command"
+require "cuenote/api/result"
+
 module Cuenote::Api
   class Connection
-    def send(req)
-      uri = req.uri
-      response = Net::HTTP.start uri.hostname, uri.port, use_ssl: (uri.scheme == 'https') do |http|
-        http.request req
-      end
-      Response.new response
+    def initialize *commands
+      @commands = commands
+    end
+
+    def send
+      Net::HTTP.start uri.hostname, uri.port, use_ssl: (uri.scheme == 'https') do |http|
+        http.request request
+      end.tap {|res| puts res.body }
+    end
+
+    def response
+      @response ||= Result.new(send.body)
+    end
+
+    def request
+      req = Net::HTTP::Post.new(uri)
+      req.basic_auth username, password
+      req.content_type = 'form-data'
+      req.body = body.map{|k,v| "#{k}=#{v}" }.join("&")
+      req
+    end
+
+    def builder
+      @builder ||= ::Builder::XmlMarkup.new
+    end
+
+    def body
+      {
+        CCC: "愛",
+        xml: build
+      }
+    end
+
+    def build
+      builder.forcast do |forcast|
+        @commands.map.with_index do |command, id|
+          forcast << command.build(id)
+        end
+      end.tap{|xml| puts xml }
+    end
+
+    def uri
+      @uri ||= URI(config.endpoint)
+    end
+
+    def username
+      config.username
+    end
+
+    def password
+      config.password
+    end
+
+    def config
+      Cuenote::Api.config
     end
   end
 end

data/lib/cuenote/api/import.rb

@@ -2,29 +2,25 @@ require "cuenote/api/base"
 
 module Cuenote::Api
   class Import < Base
-    def initialize(options={})
-      @options = options
+    def initialize(params={})
+      @params = params
     end
 
-    def set
-      req = Request.new
-      req.add_command 'setImportEntry', 1, @options
-      res = connection.send req
+    def set params={}
+      res = run 'setImportEntry', @params.merge(params)
       @impid = res.attributes[:impid]
     end
 
-    def get
+    def get params={}
       @impid
     end
 
-    def test
+    def test params={}
       @impid
     end
 
-    def start
-      req = Request.new
-      req.add_command 'startImportEntry', 1, impid: @impid
-      res = connection.send req
+    def start params={}
+      run 'startImportEntry', params.merge(impid: @impid)
     end
   end
 end

data/lib/cuenote/api/node.rb

@@ -0,0 +1,30 @@
+require 'rexml/document'
+
+require "cuenote/api/base"
+
+module Cuenote::Api
+  class Node < Base
+    def initialize(doc=nil)
+      @doc =
+        case doc
+        when REXML::Element
+          doc
+        when String
+          REXML::Document.new(doc)
+        else
+          REXML::Document.new('<a/>')
+        end
+    end
+
+    def attributes
+      @attributes ||= @doc.attributes.inject({}) do
+        |hash, attr| hash[attr[0].to_sym] = attr[1]
+        hash
+      end
+    end
+
+    def elements
+      @doc.elements
+    end
+  end
+end

data/lib/cuenote/api/result.rb

@@ -0,0 +1,10 @@
+require "cuenote/api/node"
+
+module Cuenote::Api
+  class Result < Node
+    def initialize(doc=nil)
+      super
+      @doc = @doc.elements['forcast/result']
+    end
+  end
+end

data/lib/cuenote/api/version.rb

@@ -1,5 +1,5 @@
 module Cuenote
   module Api
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/spec/integration/address_spec.rb

@@ -0,0 +1,24 @@
+describe "get address" do
+  before do
+    Cuenote::Api.configure do |config|
+      config.endpoint = ENV['CUENOTE_ENDPOINT']
+      config.username = ENV['CUENOTE_USERNAME']
+      config.password = ENV['CUENOTE_PASSWORD']
+    end
+    WebMock.disable!
+  end
+
+  after do
+    WebMock.enable!
+  end
+
+  it "get address book" do
+    books = Cuenote::Api::AddressBook.list
+    book = books[0]
+
+    expect(book).to be_a_kind_of Cuenote::Api::AddressBook
+
+    import = book.import
+    expect(import).to be_a_kind_of Cuenote::Api::Import
+  end
+end

data/spec/lib/cuenote/api/command_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Cuenote::Api::Command do
+  it "build xml" do
+    @builder = Cuenote::Api::Command.new 'command', { key: 'val' }
+    expect(@builder.build(1)).to eq <<-XML.chomp
+<execute id="1" command="command"><parameter><key>val</key></parameter></execute>
+    XML
+  end
+
+  it "build xml without params" do
+    @builder = Cuenote::Api::Command.new 'command'
+    expect(@builder.build(1)).to eq <<-XML.chomp
+<execute id="1" command="command"/>
+    XML
+  end
+end

data/spec/lib/cuenote/api/config_spec.rb

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 describe Cuenote::Api::Config do
-  it "default config" do
-    expect(Cuenote::Api.config.endpoint).to eq "http://asp.cuenote.jp/api/fcio.cgi"
-  end
-
   it "changed config" do
     Cuenote::Api.config.endpoint "https://hoge.asp.cuenote.jp/api/fcio.cgi"
     expect(Cuenote::Api.config.endpoint).to eq "https://hoge.asp.cuenote.jp/api/fcio.cgi"
@@ -12,8 +8,20 @@ describe Cuenote::Api::Config do
 
   it "changed config with configure" do
     Cuenote::Api.configure do |config|
-      config.endpoint "https://hoge.asp.cuenote.jp/api/fcio.cgi"
+      config.endpoint "https://moge.asp.cuenote.jp/api/fcio.cgi"
     end
-    expect(Cuenote::Api.config.endpoint).to eq "https://hoge.asp.cuenote.jp/api/fcio.cgi"
+    expect(Cuenote::Api.config.endpoint).to eq "https://moge.asp.cuenote.jp/api/fcio.cgi"
+  end
+
+  it "changed config use equal" do
+    Cuenote::Api.config.endpoint = "https://fuga.asp.cuenote.jp/api/fcio.cgi"
+    expect(Cuenote::Api.config.endpoint).to eq "https://fuga.asp.cuenote.jp/api/fcio.cgi"
+  end
+
+  it "changed config with configure use equal" do
+    Cuenote::Api.configure do |config|
+      config.endpoint = "https://hage.asp.cuenote.jp/api/fcio.cgi"
+    end
+    expect(Cuenote::Api.config.endpoint).to eq "https://hage.asp.cuenote.jp/api/fcio.cgi"
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 require "cuenote-api"
 require 'webmock/rspec'
+require 'dotenv'
 
+Dotenv.load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuenote-api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Eido NABESHIMA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cuenote API
 email:
 - closer009@gmail.com
@@ -95,18 +109,19 @@ files:
 - cuenote-api.gemspec
 - lib/cuenote-api.rb
 - lib/cuenote/api.rb
+- lib/cuenote/api/address.rb
+- lib/cuenote/api/address_book.rb
 - lib/cuenote/api/base.rb
+- lib/cuenote/api/command.rb
 - lib/cuenote/api/config.rb
 - lib/cuenote/api/connection.rb
 - lib/cuenote/api/import.rb
-- lib/cuenote/api/request.rb
-- lib/cuenote/api/response.rb
+- lib/cuenote/api/node.rb
+- lib/cuenote/api/result.rb
 - lib/cuenote/api/version.rb
-- lib/cuenote/api/xml_builder.rb
+- spec/integration/address_spec.rb
+- spec/lib/cuenote/api/command_spec.rb
 - spec/lib/cuenote/api/config_spec.rb
-- spec/lib/cuenote/api/request_spec.rb
-- spec/lib/cuenote/api/response_spec.rb
-- spec/lib/cuenote/api/xml_builder_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -133,9 +148,8 @@ signing_key:
 specification_version: 4
 summary: Cuenote API
 test_files:
+- spec/integration/address_spec.rb
+- spec/lib/cuenote/api/command_spec.rb
 - spec/lib/cuenote/api/config_spec.rb
-- spec/lib/cuenote/api/request_spec.rb
-- spec/lib/cuenote/api/response_spec.rb
-- spec/lib/cuenote/api/xml_builder_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/cuenote/api/request.rb

@@ -1,46 +0,0 @@
-require "cuenote/api/xml_builder"
-require "cuenote/api/config"
-require 'net/http'
-
-module Cuenote::Api
-  class Request
-    def req
-      req = Net::HTTP::Post.new(uri)
-      req.basic_auth user, password
-      req.content_type = 'form-data'
-      req.body = body
-      req
-    end
-
-    def add_command command, id, params
-      builder.add_command command, id, params
-    end
-
-    def builder
-      @builder ||= Cuenote::Api::XmlBuilder.new
-    end
-
-    def body
-      {
-        CCC: "愛",
-        xml: builder.build
-      }
-    end
-
-    def uri
-      @uri ||= URI(config.endpoint)
-    end
-
-    def user
-      config.user
-    end
-
-    def password
-      config.password
-    end
-
-    def config
-      Cuenote::Api.config
-    end
-  end
-end

data/lib/cuenote/api/response.rb

@@ -1,31 +0,0 @@
-require 'rexml/document'
-
-module Cuenote::Api
-  class Response
-    def initialize(response)
-      @response = response
-    end
-
-    def attributes
-      @attributes ||= result.attributes.inject({}) do
-        |hash, attr| hash[attr[0].to_sym] = attr[1]
-        hash
-      end
-    end
-
-    def params
-      @params ||= result.elements.map.inject({}) do |hash, element|
-        hash[element.name.to_sym] = element.text
-        hash
-      end
-    end
-
-    def result
-      @result ||= doc.elements['forecast/result']
-    end
-
-    def doc
-      @doc ||= REXML::Document.new @response.body
-    end
-  end
-end

data/lib/cuenote/api/xml_builder.rb

@@ -1,44 +0,0 @@
-require "builder"
-
-module Cuenote
-  module Api
-    class XmlBuilder
-      def initialize
-        @builder = ::Builder::XmlMarkup.new
-        @commands = []
-      end
-
-      def add_command command, id=nil, params=nil
-        id, params = [nil, id] if id && !params && Hash === id
-        @commands << [command, id, params]
-      end
-
-      def build
-        @builder.forecast do |forecast|
-          @commands.each do |command, id, params|
-            build_command command, id, params
-          end
-        end
-      end
-
-      private
-
-      def build_command command, id, params
-        options = {}
-        options[:id] = id if id
-        options[:command] = command
-        if params
-          @builder.execute options do |exec|
-            exec.parameter do |parameter|
-              params.each do |key, val|
-                eval "parameter.#{key} #{val}"
-              end
-            end
-          end
-        else
-          @builder.execute options
-        end
-      end
-    end
-  end
-end

data/spec/lib/cuenote/api/request_spec.rb

@@ -1,11 +0,0 @@
-require "spec_helper"
-
-describe Cuenote::Api::Request do
-  before do
-    @request = Cuenote::Api::Request.new
-  end
-
-  it "send" do
-    stub_request(:any, Cuenote::Api.config.endpoint)
-  end
-end

data/spec/lib/cuenote/api/response_spec.rb

@@ -1,14 +0,0 @@
-require "spec_helper"
-
-describe Cuenote::Api::Response do
-  before do
-  end
-
-  it do
-    stub_request(:any, Cuenote::Api.config.endpoint)
-      .to_return(body: '<forecast><result command="setImportEntry" id="1"> <impid>1</impid><status>ok</status> <statuscode>1</statuscode></result></forecast>')
-    request = Cuenote::Api::Request.new
-    # expect(@response.attributes).to eq({ command: "setImportEntry", id: '1'})
-    # expect(@response.params).to eq({ impid: '1', status: 'ok', statuscode: '1' })
-  end
-end

data/spec/lib/cuenote/api/xml_builder_spec.rb

@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe Cuenote::Api::XmlBuilder do
-  before do
-    @builder = Cuenote::Api::XmlBuilder.new
-  end
-
-  it "build xml" do
-    @builder.add_command 'command', 1, { key: 'val' }
-    expect(@builder.build).to eq <<-XML.chomp
-<forecast><execute id="1" command="command"><parameter><key>val</key></parameter></execute></forecast>
-    XML
-  end
-
-  it "build xml without id" do
-    @builder.add_command 'command', { key: 'val' }
-    expect(@builder.build).to eq <<-XML.chomp
-<forecast><execute command="command"><parameter><key>val</key></parameter></execute></forecast>
-    XML
-  end
-
-  it "build xml without params" do
-    @builder.add_command 'command', 1
-    expect(@builder.build).to eq <<-XML.chomp
-<forecast><execute id="1" command="command"/></forecast>
-    XML
-  end
-
-  it "build xml only command name" do
-    @builder.add_command 'command'
-    expect(@builder.build).to eq <<-XML.chomp
-<forecast><execute command="command"/></forecast>
-    XML
-  end
-end