ymaps 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+doc
+pkg
+.yardoc
+
+## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,24 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'ymaps'
-    gem.summary = %Q{Helpers for using YMaps}
-    gem.description = %Q{Different helpers for generating YMapsML, using YMaps widgets and geocoding via Yandex.Maps}
-    gem.email = 'rotuka@rotuka.com'
-    gem.homepage = 'http://github.com/rotuka/ymaps'
-    gem.authors = ['Alexander Semyonov']
-    gem.add_development_dependency 'shoulda', '>= 0'
-    gem.add_development_dependency 'yard', '>= 0'
-    gem.add_dependency 'geokit', '1.5.0'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -46,12 +27,9 @@ task :default => :test
 
 begin
   require 'yard'
-  YARD::Rake::YardocTask.new
+  YARD::Rake::YardocTask.new(:doc)
 rescue LoadError
-  task :yardoc do
+  task :doc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
-
-task :rdoc => :yard
-task :doc => :yard

data/lib/geokit/geocoders/yandex_geocoder.rb

@@ -10,15 +10,25 @@ module Geokit
       "#{lng} #{lat}"
     end
 
-    def ymaps_lnglat
+    def gml_lnglat
       "#{lng},#{lat}"
     end
 
-    def ymaps_lnglat=(lnglat)
+    def gml_lnglat=(lnglat)
       self.lng, self.lat = lnglat[0], lnglat[1]
     end
   end
 
+  class Bounds
+    def lower
+      sw
+    end
+
+    def upper
+      ne
+    end
+  end
+
   class GeoLoc
     attr_accessor :kind
     attr_writer :street_number, :street_name
@@ -88,7 +98,7 @@ module Geokit
 
       def self.do_reverse_geocode(latlng)
         latlng = LatLng.normalize(latlng)
-        call_geocoder_service(latlng.ymaps_lnglat) || GeoLoc.new
+        call_geocoder_service(latlng.gml_lnglat) || GeoLoc.new
       end
 
       def self.do_geocode(address, options = {})
@@ -125,7 +135,7 @@ module Geokit
         res.provider = 'yandex'
 
         # basics
-        res.ymaps_lnglat  = doc.elements['.//Point/pos'].text.to_s.split(' ')
+        res.gml_lnglat  = doc.elements['.//Point/pos'].text.to_s.split(' ')
 
         # extended -- false if not available
         res.full_address  = doc.elements['.//GeocoderMetaData/text'].try(:text)
@@ -144,8 +154,8 @@ module Geokit
 
         if suggested_bounds = doc.elements['.//boundedBy']
           res.suggested_bounds = Bounds.normalize(
-            suggested_bounds.elements['.//lowerCorner'].text.to_s.split(' '),
-            suggested_bounds.elements['.//upperCorner'].text.to_s.split(' ')
+            suggested_bounds.elements['.//lowerCorner'].text.to_s.split(' ').reverse,
+            suggested_bounds.elements['.//upperCorner'].text.to_s.split(' ').reverse
           )
         end
 

data/lib/ymaps/action_view/html_helper.rb

@@ -3,15 +3,15 @@ module YMaps
     module HtmlHelper
       class StaticMapPoint < Struct.new('MapPoint', :style, :color, :size, :number, :lat, :lng)
         def to_s
-          "#{ymaps_lnglat},#{style}#{color}#{size}#{number}"
+          "#{gml_lnglat},#{style}#{color}#{size}#{number}"
         end
 
-        def ymaps_lnglat
-          @ymaps_lnglat ||= "#{lng},#{lat}"
+        def gml_lnglat
+          @gml_lnglat ||= "#{lng},#{lat}"
         end
 
-        def ymaps_lnglat=(latlng)
-          @ymaps_lnglat = latlng
+        def gml_lnglat=(latlng)
+          @gml_lnglat = latlng
         end
 
         def attributes=(attrs)
@@ -65,7 +65,7 @@ module YMaps
         )
 
         collection = Array(resources).inject([]) do |result, resource|
-          common_point.ymaps_lnglat = resource.latlng.ymaps_lnglat
+          common_point.gml_lnglat = resource.latlng.gml_lnglat
           common_point.number += 1
           result << common_point.to_s
           result

data/lib/ymaps/action_view/ymapsml_helper.rb

@@ -64,7 +64,63 @@ module YMaps
       end
     end
 
-    class YMapsReprBuilder < Builder
+    class YMapsBuilder < Builder
+      def initialize(xml, view, ymaps_options = {})
+        @xml, @view, @ymaps_options = xml, view, ymaps_options
+      end
+
+      def collection(options = {})
+        GeoObjectCollection do
+          if options.key?(:style)
+            @xml.style("\##{options.delete(:style)}")
+          end
+          featureMembers { yield }
+        end
+      end
+
+      def object(object, options = {})
+        GeoObject do
+          if options.key?(:style)
+            @xml.style("\##{options.delete(:style)}")
+          end
+          point(object.latlng) if object.respond_to?(:latlng)
+          bounds(object.bounds) if object.respond_to?(:bounds)
+          name(options.delete(:name) { object.to_s })
+          yield self
+        end
+      end
+
+      def point(latlng)
+        Point {
+          pos(latlng.gml_pos)
+        } if latlng
+      end
+
+      def bounds(bounds)
+        boundedBy {
+          Envelope {
+            lowerCorner(bounds.lower.gml_pos)
+            upperCorner(bounds.upper.gml_pos)
+          }
+        } if bounds
+      end
+
+      def meta_data
+        metaDataProperty {
+          AnyMetaData {
+            yield(@xml)
+          }
+        }
+      end
+
+      def representation
+        Representation {
+          yield(YMapsReprBuilder.new(@xml, @view))
+        }
+      end
+    end
+
+    class YMapsReprBuilder < YMapsBuilder
       ACCEPTABLE_STYLES = {
         :balloon_content => [:template],
         :hint_content => [:template],
@@ -76,9 +132,8 @@ module YMaps
 
       def view(options = {})
         View {
-          if options[:type]
-            mapType(options[:type].to_s.upcase)
-          end
+          mapType(options[:type].to_s.upcase) if options[:type]
+          bounds(options[:bounds]) if options[:bounds]
           yield if block_given?
         }
       end
@@ -151,51 +206,5 @@ module YMaps
         prefixed_method(:offset, :x => x, :y => y)
       end
     end
-
-    class YMapsBuilder < Builder
-      def initialize(xml, view, ymaps_options = {})
-        @xml, @view, @ymaps_options = xml, view, ymaps_options
-      end
-
-      def collection(options = {})
-        GeoObjectCollection do
-          if options.key?(:style)
-            @xml.style("\##{options.delete(:style)}")
-          end
-          featureMembers { yield }
-        end
-      end
-
-      def object(object, options = {})
-        GeoObject do
-          if options.key?(:style)
-            @xml.style("\##{options.delete(:style)}")
-          end
-          point(object.latlng)
-          name(options.delete(:name) { object.to_s })
-          yield self
-        end
-      end
-
-      def point(latlng)
-        Point {
-          pos(latlng.gml_pos)
-        }
-      end
-
-      def meta_data
-        metaDataProperty {
-          AnyMetaData {
-            yield(@xml)
-          }
-        }
-      end
-
-      def representation
-        Representation {
-          yield(YMapsReprBuilder.new(@xml))
-        }
-      end
-    end
   end
 end

data/lib/ymaps/version.rb

@@ -0,0 +1,3 @@
+module YMaps
+  VERSION = '0.0.4'
+end

data/ymaps.gemspec

@@ -1,64 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'ymaps/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{ymaps}
-  s.version = "0.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexander Semyonov"]
-  s.date = %q{2011-01-27}
+  s.name        = 'ymaps'
+  s.version     = YMaps::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Alexander Semyonov']
+  s.email       = ['al@semyonov.us']
+  s.homepage    = 'http://github.com/rotuka/ymaps'
+  s.summary     = %q{Helpers for using YMaps}
   s.description = %q{Different helpers for generating YMapsML, using YMaps widgets and geocoding via Yandex.Maps}
-  s.email = %q{rotuka@rotuka.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "init.rb",
-    "lib/geokit/geocoders/yandex_geocoder.rb",
-    "lib/geokit/inflector.rb",
-    "lib/ymaps.rb",
-    "lib/ymaps/action_view.rb",
-    "lib/ymaps/action_view/html_helper.rb",
-    "lib/ymaps/action_view/ymapsml_helper.rb",
-    "test/helper.rb",
-    "test/test_ymaps.rb",
-    "ymaps.gemspec"
-  ]
-  s.homepage = %q{http://github.com/rotuka/ymaps}
+
+  s.rubyforge_project = 'ymaps'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Helpers for using YMaps}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_ymaps.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency('geokit',              '= 1.5.0')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<geokit>, ["= 1.5.0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<geokit>, ["= 1.5.0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<geokit>, ["= 1.5.0"])
-  end
+  s.add_development_dependency('shoulda', '>= 0')
+  s.add_development_dependency('yard',    '>= 0')
 end
-

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -14,24 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +03:00
+date: 2011-05-09 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: geokit
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 5
         - 0
-        version: "0"
-  type: :development
+        version: 1.5.0
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,31 +46,31 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: geokit
+  name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id003
 description: Different helpers for generating YMapsML, using YMaps widgets and geocoding via Yandex.Maps
-email: rotuka@rotuka.com
+email: 
+- al@semyonov.us
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -80,6 +82,7 @@ files:
 - lib/ymaps/action_view.rb
 - lib/ymaps/action_view/html_helper.rb
 - lib/ymaps/action_view/ymapsml_helper.rb
+- lib/ymaps/version.rb
 - test/helper.rb
 - test/test_ymaps.rb
 - ymaps.gemspec
@@ -110,11 +113,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: ymaps
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Helpers for using YMaps
-test_files: 
-- test/helper.rb
-- test/test_ymaps.rb
+test_files: []
+