tepco_usage_api 0.3.0 → 0.4.0

data/lib/tepco_usage_api.rb

@@ -2,39 +2,83 @@ require 'net/http'
 require 'json'
 
 class TepcoUsage
+  @@default_options = {
+    :proxy => nil
+  }
+
+  def initialize(options = {})
+    @options = @@default_options.merge(options.inject({}) do |opts, (key, value)|
+      opts[key.to_sym] = value
+      opts
+    end)
+  end
+
+  def latest
+    response = request('/latest.json')
+    JSON.parse(response.body)
+  end
+
+  def at(arg)
+    path = case arg
+           when Date
+             "/#{arg.year}/#{arg.month}/#{arg.day}.json"
+           when Time
+             "/#{arg.year}/#{arg.month}/#{arg.day}/#{arg.hour}.json"
+           end
+    response = request(path)
+    JSON.parse(response.body)
+  end
+
+  def in(arg)
+    path = "/#{arg.year}/#{arg.month}.json"
+    response = request(path)
+    JSON.parse(response.body)
+  end
+
+  private
+
+  def http_class
+    if proxy = @options[:proxy]
+      proxy_uri = proxy.is_a?(URI) ? proxy : URI.parse(proxy)
+      Net::HTTP.Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+    else
+      Net::HTTP
+    end
+  end
+
+  def create_http
+    host = 'tepco-usage-api.appspot.com'
+    http_class.new(host)
+  end
+
+  def http
+    @http ||= create_http
+  end
+
+  def request(path)
+    http.request_get(path)
+  end
+
   class << self
     def latest
-      response = request('/latest.json')
-      JSON.parse(response.body)
+      tepco.latest
     end
 
     def at(arg)
-      path = case arg
-             when Date 
-               "/#{arg.year}/#{arg.month}/#{arg.day}.json"
-             when Time
-               "/#{arg.year}/#{arg.month}/#{arg.day}/#{arg.hour}.json"
-             end
-      response = request(path)
-      JSON.parse(response.body)
+      tepco.at(arg)
     end
 
     def in(arg)
-      path = "/#{arg.year}/#{arg.month}.json"
-      response = request(path)
-      JSON.parse(response.body)
+      tepco.in(arg)
     end
 
     private
-    def request(path)
-      http.request_get(path) 
-    end
 
-    def http
-      unless @http
-        @http = Net::HTTP.new('tepco-usage-api.appspot.com')
+    def tepco
+      unless @tepco
+        @tepco = TepcoUsage.new
       end
-      @http
+      @tepco
     end
   end
 end

data/spec/tepco_usage_api_spec.rb

@@ -5,19 +5,20 @@ require 'date'
 describe TepcoUsage do
   describe "#latest" do
     before do
-      TepcoUsage.stub!(:request).with('/latest.json').and_return do
+      tepco = TepcoUsage.send(:tepco)
+      tepco.stub!(:request).with('/latest.json').and_return do
         mock = mock(Object.new, :body => <<-JSON)
            {
-             "saving": false, 
-             "hour": 0, 
-             "capacity_updated": "2011-03-26 09:30:00", 
-             "month": 3, 
-             "usage_updated": "2011-03-26 16:30:54", 
-             "entryfor": "2011-03-26 15:00:00", 
-             "capacity_peak_period": 18, 
-             "year": 2011, 
-             "usage": 2904, 
-             "capacity": 3700, 
+             "saving": false,
+             "hour": 0,
+             "capacity_updated": "2011-03-26 09:30:00",
+             "month": 3,
+             "usage_updated": "2011-03-26 16:30:54",
+             "entryfor": "2011-03-26 15:00:00",
+             "capacity_peak_period": 18,
+             "year": 2011,
+             "usage": 2904,
+             "capacity": 3700,
              "day": 27
            }
         JSON
@@ -25,46 +26,47 @@ describe TepcoUsage do
     end
 
     subject{TepcoUsage}
-    its(:latest) { should_not be_nil } 
+    its(:latest) { should_not be_nil }
     it do
       TepcoUsage.latest['saving'].should be_false
     end
-    
+
   end
   describe "#at" do
     context "Given Date object" do
       before do
         today = Date.today
         path = "/#{today.year}/#{today.month}/#{today.day}.json"
-        TepcoUsage.stub!(:request).with(path).and_return do
+        tepco = TepcoUsage.send(:tepco)
+        tepco.stub!(:request).with(path).and_return do
           mock = mock(Object.new, :body => <<-JSON)
           [
             {
-              "saving": false, 
-              "hour": 0, 
-              "capacity_updated": "2011-03-25 16:05:00", 
-              "month": 3, 
-              "usage_updated": "2011-03-25 16:30:49", 
-              "entryfor": "2011-03-25 15:00:00", 
-              "capacity_peak_period": null, 
-              "year": 2011, 
-              "usage": 2889, 
-              "capacity": 3750, 
+              "saving": false,
+              "hour": 0,
+              "capacity_updated": "2011-03-25 16:05:00",
+              "month": 3,
+              "usage_updated": "2011-03-25 16:30:49",
+              "entryfor": "2011-03-25 15:00:00",
+              "capacity_peak_period": null,
+              "year": 2011,
+              "usage": 2889,
+              "capacity": 3750,
               "day": 26
-            }, 
+            },
             {
-              "saving": false, 
-              "hour": 1, 
-              "capacity_updated": "2011-03-25 16:05:00", 
-              "month": 3, 
-              "usage_updated": "2011-03-25 17:05:49", 
-              "entryfor": "2011-03-25 16:00:00", 
-              "capacity_peak_period": null, 
-              "year": 2011, 
-              "usage": 2758, 
-              "capacity": 3750, 
+              "saving": false,
+              "hour": 1,
+              "capacity_updated": "2011-03-25 16:05:00",
+              "month": 3,
+              "usage_updated": "2011-03-25 17:05:49",
+              "entryfor": "2011-03-25 16:00:00",
+              "capacity_peak_period": null,
+              "year": 2011,
+              "usage": 2758,
+              "capacity": 3750,
               "day": 26
-            } 
+            }
           ]
           JSON
         end
@@ -72,39 +74,41 @@ describe TepcoUsage do
       subject{TepcoUsage.at(Date.today)}
       it { should_not be_nil }
     end
+
     context "Given Time object" do
       before do
         @now = Time.now
         path = "/#{@now.year}/#{@now.month}/#{@now.day}/#{@now.hour}.json"
-        TepcoUsage.stub!(:request).with(path).and_return do
+        tepco = TepcoUsage.send(:tepco)
+        tepco.stub!(:request).with(path).and_return do
           mock = mock(Object.new, :body => <<-JSON)
           [
             {
-              "saving": false, 
-              "hour": 0, 
-              "capacity_updated": "2011-03-25 16:05:00", 
-              "month": 3, 
-              "usage_updated": "2011-03-25 16:30:49", 
-              "entryfor": "2011-03-25 15:00:00", 
-              "capacity_peak_period": null, 
-              "year": 2011, 
-              "usage": 2889, 
-              "capacity": 3750, 
+              "saving": false,
+              "hour": 0,
+              "capacity_updated": "2011-03-25 16:05:00",
+              "month": 3,
+              "usage_updated": "2011-03-25 16:30:49",
+              "entryfor": "2011-03-25 15:00:00",
+              "capacity_peak_period": null,
+              "year": 2011,
+              "usage": 2889,
+              "capacity": 3750,
               "day": 26
-            }, 
+            },
             {
-              "saving": false, 
-              "hour": 1, 
-              "capacity_updated": "2011-03-25 16:05:00", 
-              "month": 3, 
-              "usage_updated": "2011-03-25 17:05:49", 
-              "entryfor": "2011-03-25 16:00:00", 
-              "capacity_peak_period": null, 
-              "year": 2011, 
-              "usage": 2758, 
-              "capacity": 3750, 
+              "saving": false,
+              "hour": 1,
+              "capacity_updated": "2011-03-25 16:05:00",
+              "month": 3,
+              "usage_updated": "2011-03-25 17:05:49",
+              "entryfor": "2011-03-25 16:00:00",
+              "capacity_peak_period": null,
+              "year": 2011,
+              "usage": 2758,
+              "capacity": 3750,
               "day": 26
-            } 
+            }
           ]
           JSON
         end
@@ -117,12 +121,32 @@ describe TepcoUsage do
     before do
       @now = Time.now
       path = "/#{@now.year}/#{@now.month}.json"
-      TepcoUsage.stub!(:request).with(path).and_return do
+      tepco = TepcoUsage.send(:tepco)
+      tepco.stub!(:request).with(path).and_return do
         mock(Object.new, :body => '{"body": "dummy"}')
       end
     end
 
     subject{TepcoUsage.in @now}
-    it { should_not be_nil } 
+    it { should_not be_nil }
+  end
+
+  context "Configuration" do
+    describe "About Proxy" do
+      before do
+        host = 'proxy.example.com'
+        port = 4567
+        user = 'proxy_user'
+        password = 'proxy_pass'
+        @proxy = URI.parse("http://#{user}:#{password}@#{host}:#{port}")
+        @tepco = TepcoUsage.new(:proxy => @proxy)
+      end
+      subject {@tepco.send :http_class}
+      it { should be_proxy_class }
+      its(:proxy_address) { should == @proxy.host }
+      its(:proxy_port) { should == @proxy.port }
+      its(:proxy_user) { should == @proxy.user }
+      its(:proxy_pass) { should == @proxy.password }
+    end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tatsuya Sato
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +09:00
+date: 2011-10-23 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.rdoc
 - LICENCE.txt
+- README.rdoc
 - lib/tepco_usage_api.rb
-- spec/tepco_usage_api_spec.rb
 - spec/spec_helper.rb
+- spec/tepco_usage_api_spec.rb
 has_rdoc: true
 homepage: http://github.com/satoryu/tepco_usage_api/
 licenses: