cartographie 0.0.1 → 0.0.2

data/README.md

@@ -20,8 +20,23 @@ Cartographie.map('San Francisco, CA')
 Cartographie.map('New York, NY', width: 200, height: 200, zoom: 10)
 ```
 
+**Configuration**
+
+```ruby
+Cartographie.configure do |config|
+  config.width = 640
+  config.height = 640
+  config.zoom = 12
+  config.file_format = 'jpg'
+  config.sensor = true
+end
+```
+
 **Defaults**
 
+If you do not pass options when generating a map, nor configure a map attribute
+using the configuration block, the following values will be used:
+
 - width: 300
 - height: 300
 - zoom: 15

data/lib/cartographie.rb

@@ -3,6 +3,7 @@ require "cartographie/version"
 # Cartographie is the root module for all of Cartographie's components
 module Cartographie
 
+  autoload :Config, 'cartographie/config'
   autoload :Map, 'cartographie/map'
 
   # Public: Create a new Map instance.
@@ -25,4 +26,8 @@ module Cartographie
     Map.new(location, options)
   end
 
+  def self.configure(&block)
+    Cartographie::Config.configure(&block)
+  end
+
 end

data/lib/cartographie/config.rb

@@ -0,0 +1,65 @@
+module Cartographie
+  module Config
+    extend self
+
+    def configure
+      yield self
+    end
+
+    def api_endpoint
+      OPTIONS[:api_endpoint]
+    end
+
+    def width
+      OPTIONS[:width]
+    end
+
+    def width=(value)
+      OPTIONS[:width] = value
+    end
+
+    def height
+      OPTIONS[:height]
+    end
+
+    def height=(value)
+      OPTIONS[:height] = value
+    end
+
+    def zoom
+      OPTIONS[:zoom]
+    end
+
+    def zoom=(value)
+      OPTIONS[:zoom] = value
+    end
+
+    def file_format
+      OPTIONS[:file_format]
+    end
+
+    def file_format=(value)
+      OPTIONS[:file_format] = value
+    end
+
+    def sensor
+      OPTIONS[:sensor]
+    end
+
+    def sensor=(value)
+      OPTIONS[:sensor] = value
+    end
+
+    private
+
+    DEFAULTS = {
+      api_endpoint: 'http://maps.googleapis.com/maps/api/staticmap',
+      width: 300,
+      height: 300,
+      zoom: 15,
+      file_format: 'png',
+      sensor: false
+    }
+    OPTIONS = {}.merge!(DEFAULTS)
+  end
+end

data/lib/cartographie/map.rb

@@ -11,13 +11,6 @@ module Cartographie
     # Public: Gets/Sets the Hash options for the map.
     attr_accessor :options
 
-    API_ENDPOINT        = 'http://maps.googleapis.com/maps/api/staticmap'
-    DEFAULT_WIDTH       = 300
-    DEFAULT_HEIGHT      = 300
-    DEFAULT_ZOOM        = 15
-    DEFAULT_FILE_FORMAT = 'png'
-    DEFAULT_SENSOR      = false
-
     # Public: Initialize a Map
     #
     # location - The String for the map's location (default: 'Paris, France').
@@ -55,27 +48,27 @@ module Cartographie
 
     # Returns the Integer width passed in options, or default
     def width
-      options[:width] || DEFAULT_WIDTH
+      options[:width] || Config.width
     end
 
     # Returns the Integer height passed in options, or default
     def height
-      options[:height] || DEFAULT_HEIGHT
+      options[:height] || Config.height
     end
 
     # Returns the Integer zoom level passed in options, or default
     def zoom
-      options[:zoom] || DEFAULT_ZOOM
+      options[:zoom] || Config.zoom
     end
 
     # Returns the String file format passed in options, or default
     def file_format
-      options[:file_format] || DEFAULT_FILE_FORMAT
+      options[:file_format] || Config.file_format
     end
 
     # Returns the Boolean indicating sensor usage passed in options, or default
     def sensor
-      options[:sensor] || DEFAULT_SENSOR
+      options[:sensor] || Config.sensor
     end
 
     # Returns a string combining width and height into dimensions
@@ -86,7 +79,7 @@ module Cartographie
     private
 
     def api_endpoint
-      API_ENDPOINT
+      Config.api_endpoint
     end
   end
 end

data/lib/cartographie/version.rb

@@ -1,3 +1,3 @@
 module Cartographie
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/cartographie/config_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'cartographie'
+require 'cartographie/config'
+
+describe Cartographie::Config do
+  subject { Cartographie::Config }
+
+  describe "default configs" do
+    its(:api_endpoint) { should eq('http://maps.googleapis.com/maps/api/staticmap') }
+    its(:width) { should eq(300) }
+    its(:height) { should eq(300) }
+    its(:zoom) { should eq(15) }
+    its(:file_format) { should eq('png') }
+    its(:sensor) { should be_false }
+  end
+
+  describe "setting new defaults" do
+    before do
+      Cartographie.configure do |config|
+        config.width = 100
+        config.height = 100
+        config.zoom = 10
+        config.file_format = 'jpg'
+        config.sensor = true
+      end
+    end
+
+    its(:width) { should eq(100) }
+    its(:height) { should eq(100) }
+    its(:zoom) { should eq(10) }
+    its(:file_format) { should eq('jpg') }
+    its(:sensor) { should be_true }
+  end
+end

data/spec/cartographie/map_spec.rb

@@ -5,16 +5,6 @@ describe Cartographie::Map do
 
   subject { described_class.new }
 
-  describe 'defaults' do
-    its(:location) { should eq('Paris, France') }
-    its(:width) { should eq(300) }
-    its(:height) { should eq(300) }
-    its(:size) { should eq('300x300') }
-    its(:zoom) { should eq(15) }
-    its(:file_format) { should eq('png') }
-    its(:sensor) { should be_false }
-  end
-
   describe 'with options' do
     let(:options) do
       { width: 75, height: 75, zoom: 10, file_format: 'jpg', sensor: true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartographie
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70348616677260 !ruby/object:Gem::Requirement
+  requirement: &70210921610020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348616677260
+  version_requirements: *70210921610020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348616676800 !ruby/object:Gem::Requirement
+  requirement: &70210921609580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348616676800
+  version_requirements: *70210921609580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348616676220 !ruby/object:Gem::Requirement
+  requirement: &70210921609000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70348616676220
+  version_requirements: *70210921609000
 description: Beautiful map generation
 email:
 - mattonrails@shortmail.com
@@ -60,8 +60,10 @@ files:
 - Rakefile
 - cartographie.gemspec
 - lib/cartographie.rb
+- lib/cartographie/config.rb
 - lib/cartographie/map.rb
 - lib/cartographie/version.rb
+- spec/cartographie/config_spec.rb
 - spec/cartographie/map_spec.rb
 - spec/cartographie_spec.rb
 - spec/spec_helper.rb
@@ -90,6 +92,7 @@ signing_key:
 specification_version: 3
 summary: Wrapper for Google's Static Maps API
 test_files:
+- spec/cartographie/config_spec.rb
 - spec/cartographie/map_spec.rb
 - spec/cartographie_spec.rb
 - spec/spec_helper.rb