pretty_weather 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c7f18071045d6985ba310b1f98a4ab241c7fd7
-  data.tar.gz: 83ac597ebed14444f0cda4b36b2eb591b20bf96f
+  metadata.gz: b6a534d2f4eb046d0d611f626a2753692b30dea9
+  data.tar.gz: 2f4594cbbe8a42715c05a94441593c63c18e3992
 SHA512:
-  metadata.gz: 06b4b134e3ce6752694732564b0cf95be1b564b76a0b8fc8e9706751ed0aad1528622c3158172f0b9168d157e97256c2051e377476c1f127d3ddebfdc652f2a9
-  data.tar.gz: f12d7d61328b5a90fc235e2215a5e21c693bf6e7a2efa984f79bec4f44cd72db2a27de1f2a94af2d5b5a81add17656200d5b2fe8042e7efa3a2bba261143a8b7
+  metadata.gz: e05c07e0d4321f1b29c6222e470ce301ef6157c8a82ef3cd95e4f21f46f5a1ccaffcb4f749bf172ffd59ee35e816a26a2fb8ba9f006ab0f17c6c3de5276b6e91
+  data.tar.gz: 369373cfcd2764f7ca74b098af62489f9182376102cad0a6cc73100d9e4098bd8bd9962566f30549959ef76df97fd59e6f76207d869b00a863e317dd4f8f5a5b

data/lib/pretty_weather/configuration.rb

@@ -1,10 +1,11 @@
 module PrettyWeather
   class Configuration
-    attr_accessor :city_name, :units
+    attr_accessor :city_param, :units, :mode
 
     def initialize
-      @city_name = 'london'
+      @city_param = 'london'
       @units = 'metric'
+      @mode = 'city_name'
     end
 
     def set_options(&block)

data/lib/pretty_weather/pretty_weather_helper.rb

@@ -1,13 +1,13 @@
 module PrettyWeather
-  def weather_tag(city = Rails.application.config.pretty_weather.city_name, units = Rails.application.config.pretty_weather.units)
-    Weather.new(city, units).icon_tag
+  def weather_tag(city = Rails.application.config.pretty_weather.city_param, units = Rails.application.config.pretty_weather.units, mode = Rails.application.config.pretty_weather.mode)
+    Weather.new(city, units, mode).icon_tag
   end
 
-  def weather_temp(city = Rails.application.config.pretty_weather.city_name, units = Rails.application.config.pretty_weather.units)
-    Weather.new(city, units).temp
+  def weather_temp(city = Rails.application.config.pretty_weather.city_param, units = Rails.application.config.pretty_weather.units, mode = Rails.application.config.pretty_weather.mode)
+    Weather.new(city, units, mode).temp
   end
 
-  def weather_condition(city = Rails.application.config.pretty_weather.city_name, units = Rails.application.config.pretty_weather.units)
-    Weather.new(city, units).weather
+  def weather_condition(city = Rails.application.config.pretty_weather.city_param, units = Rails.application.config.pretty_weather.units, mode = Rails.application.config.pretty_weather.mode)
+    Weather.new(city, units, mode).weather
   end
 end

data/lib/pretty_weather/version.rb

@@ -1,3 +1,3 @@
 module PrettyWeather
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/pretty_weather/weather.rb

@@ -3,17 +3,24 @@ require 'nokogiri'
 
 module PrettyWeather
   class Weather
-    attr_accessor :temp, :weather, :icon_tag, :temp_numeric, :city_name, :units, :updated_at
+    attr_accessor :temp, :weather, :icon_tag, :temp_numeric, :city_param, :mode, :units, :updated_at
 
-    def initialize(city_name, units)
-      @city_name = city_name
+    def initialize(city_param, units, mode = 'city_name')
+      @city_param = city_param
       @units = units
+      @mode = mode
 
-      collect_data(city_name, units)
+      collect_data(city_param, units, mode)
     end
 
-    def collect_data(city_name = @city_name, units = @units)
-      link = "http://api.openweathermap.org/data/2.5/weather?q=#{city_name}&mode=xml&units=#{units}" #Odesa for Odessa in Ukraine
+    def collect_data(city_param = @city_param, units = @units, mode = @mode)
+      case mode
+        when 'city_name'
+          link = "http://api.openweathermap.org/data/2.5/weather?q=#{city_param}&mode=xml&units=#{units}" #Odesa for Odessa in Ukraine
+        when 'id'
+          link = "http://api.openweathermap.org/data/2.5/weather?id=#{city_param}&mode=xml&units=#{units}"
+      end
+
       attempts = 3
 
       @updated_at = Time.now

data/test/dummy/Gemfile

@@ -0,0 +1,110 @@
+source 'https://rubygems.org'
+
+gem 'pretty_weather', '0.1.3', path: '/home/nikitasmall/server/rails-work/pretty_weather/'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.0.0'
+
+group :test, :development do
+  # Use sqlite3 as the database for Active Record
+  gem 'sqlite3'
+end
+
+# gems for production db
+gem 'mysql2'
+gem 'pg'
+
+# gem for auth
+gem 'devise'
+
+# gem for easy tags
+gem 'acts-as-taggable-on'
+
+# gem for wysiwyg editor
+gem 'ckeditor'
+
+# gem for uploads
+gem 'paperclip'
+
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.0'
+gem 'bootstrap-sass', '~> 3.3.3'
+
+# gem for pretty pagination
+gem 'will_paginate-bootstrap'
+
+# gems to make frindship for paperclip, aws, heroku and ckeditor
+gem 'aws-sdk', '~> 1.36.1'
+gem 'fog'
+gem 'figaro'
+
+# gem for better fixtures
+gem 'factory_girl_rails'
+
+# gem for ajax validation
+gem 'jquery-validation-rails'
+
+# gem for pretty photo gallery
+# gem 'swiper-rails'
+gem 'fotoramajs'
+
+# gem for captcha
+gem 'recaptcha' #, :require => 'recaptcha/rails'
+
+# some strange gem for recaptcha
+gem 'httparty'
+
+# gem for json parse
+gem 'json'
+
+# gem for good russian translation
+gem 'russian', '~> 0.6.0'
+
+# for site parsing (for weather forecasting!)
+gem 'nokogiri'
+
+# pretty weather icons (ready to bootstraping!)
+gem 'weather-icons-rails'
+
+# gem for discus integration
+gem 'disqus_rails'
+
+# gem for social sharing
+gem 'social-share-button'
+
+gem 'rspec-rails'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 1.2'
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+
+# Use ActiveModel has_secure_password
+gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]

data/test/dummy/Gemfile.lock

@@ -0,0 +1,347 @@
+PATH
+  remote: /home/nikitasmall/server/rails-work/pretty_weather
+  specs:
+    pretty_weather (0.1.3)
+      nokogiri
+      rails (~> 4.0.0)
+      weather-icons-rails
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.1)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    acts-as-taggable-on (3.5.0)
+      activerecord (>= 3.2, < 5)
+    arel (4.0.2)
+    autoprefixer-rails (5.1.11)
+      execjs
+      json
+    aws-sdk (1.36.2)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    bcrypt (3.1.10)
+    bcrypt-ruby (3.0.1)
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
+    builder (3.1.4)
+    ckeditor (4.1.1)
+      cocaine
+      orm_adapter (~> 0.5.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.7)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
+    devise (3.4.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    diff-lcs (1.2.5)
+    disqus_rails (0.0.6)
+      rails
+    erubis (2.7.0)
+    excon (0.45.3)
+    execjs (2.5.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    figaro (1.1.1)
+      thor (~> 0.14)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.30.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.4)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.2.2)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.30.0)
+      builder
+      excon (~> 0.45)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-ecloud (0.1.1)
+      fog-core
+      fog-xml
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.1)
+      fog-core (~> 1.0)
+      multi_json (~> 1.0)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.2)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.6)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    fotoramajs (4.6.4)
+      sprockets (>= 2)
+    hike (1.2.3)
+    httparty (0.13.4)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    i18n (0.7.0)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    jbuilder (1.5.3)
+      activesupport (>= 3.0.0)
+      multi_json (>= 1.2.0)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-validation-rails (1.13.1)
+      railties (>= 3.2, < 5.0)
+      thor (~> 0.14)
+    json (1.8.2)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mini_portile (0.6.2)
+    minitest (4.7.5)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
+    mysql2 (0.3.18)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    orm_adapter (0.5.0)
+    paperclip (4.2.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    pg (0.18.2)
+    polyglot (0.3.5)
+    rack (1.5.3)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+      json (~> 1.4)
+    recaptcha (0.4.0)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    russian (0.6.0)
+      i18n (>= 0.5.0)
+    sass (3.2.19)
+    sass-rails (4.0.5)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    social-share-button (0.1.8)
+      coffee-rails
+      sass-rails
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    turbolinks (2.5.3)
+      coffee-rails
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    uuidtools (2.1.5)
+    warden (1.2.3)
+      rack (>= 1.0)
+    weather-icons-rails (0.1.1)
+      railties (>= 3.2, < 5.0)
+      sass (~> 3.2)
+    will_paginate (3.0.7)
+    will_paginate-bootstrap (1.0.1)
+      will_paginate (>= 3.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts-as-taggable-on
+  aws-sdk (~> 1.36.1)
+  bcrypt-ruby (~> 3.0.0)
+  bootstrap-sass (~> 3.3.3)
+  ckeditor
+  coffee-rails (~> 4.0.0)
+  devise
+  disqus_rails
+  factory_girl_rails
+  figaro
+  fog
+  fotoramajs
+  httparty
+  jbuilder (~> 1.2)
+  jquery-rails
+  jquery-validation-rails
+  json
+  mysql2
+  nokogiri
+  paperclip
+  pg
+  pretty_weather (= 0.1.3)!
+  rails (= 4.0.0)
+  recaptcha
+  rspec-rails
+  russian (~> 0.6.0)
+  sass-rails (~> 4.0.0)
+  sdoc
+  social-share-button
+  sqlite3
+  turbolinks
+  uglifier (>= 1.3.0)
+  weather-icons-rails
+  will_paginate-bootstrap