fly_admin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe790ccb88c3b854aaa5eb9ed37b9cb767615443
-  data.tar.gz: 6087c084c181e4fb08e862b4c26a874dc3a38078
+  metadata.gz: 04a96b71887cfc1d39a76501710f129f0d13ccef
+  data.tar.gz: 1d43ec3a9d1ad992fdcd36af89edb6daa07dd568
 SHA512:
-  metadata.gz: d925a5ed3de9b1ef130a2b88a32e270d8b221a609c94109d3f264e8eefb08186346432119364784d2902939b4c1ca7d0dd383b771e4765fb2d1739c976080129
-  data.tar.gz: 2fe7947394dfd4af2b481988559d9db6cb405ad6930333ffaaed392e717cf918ad384216342bdffa0d2d7c5d1976c1da1f7db65bd8ce84a6c2bf8092e1a61306
+  metadata.gz: c9a69f55da46dcd568f96dbea5e4969c7d596d830c2bd95f56c8cf66fd88954442f0f32b84dbada2fa7f73c889686197e7f5b6f8e2ad20206ccdfb7ed282f7d0
+  data.tar.gz: a8884e6b81f41b983251cc52aee2e1c0398e475846eac2fc603d6f0a4dffe02c5481bb282617ca3317076e9f9bb8265c78e4701f3f58954df92eca0b20f54988

data/app/controllers/fly_admin/footers_controller.rb

@@ -63,8 +63,8 @@ module FlyAdmin
       end
 
       def clear_footer_cache
-        paysite = @footer.paysite
-        country = @footer.country
+        paysite = @footer.paysite.name
+        country = @footer.country.name
         SiteCache.clear_element("content_#{paysite}_#{country}")
       end
   end

data/app/helpers/fly_admin/footers_helper.rb

@@ -1,7 +1,9 @@
 module FlyAdmin
   module FootersHelper
     def cut_footer(str)
-      str.length > 30 ? str[0..30] + '...' : str
+      if str
+        str.length > 30 ? str[0..30] + '...' : str
+      end
     end  
   end
 end

data/app/views/fly_admin/categories/_form.html.haml

@@ -13,7 +13,7 @@
     = nested_form_for(category, :html => {:class => 'smart-form', :multipart => true}) do |f|
       - if category.errors.any?
         - category.errors.full_messages.each do |msg|
-          = render 'layouts/error_flash_message', msg: msg
+          = render 'layouts/fly_admin/error_flash_message', msg: msg
       %section
         .row
           - if category.poster
@@ -54,7 +54,7 @@
             = f.text_field :genre, placeholder: 'Жанр', class: 'margin-10 form-control input-sm'
       %br
       .widget-body.no-padding
-        %header Инфа о сезонах
+        %header Общая информация
         %table.table.table-bordered.margin-10.table-serials{style: 'width: 500px;'}
           %thead
             %tr
@@ -112,4 +112,4 @@
                 = link_to season_form.object.poster_url do
                   = image_tag season_form.object.poster_url, size: '100x100', class: 'margin-left-10'                  
         %footer
-          = f.submit 'Сохранить', class: 'btn btn-primary'   
+          = f.submit 'Сохранить', class: 'btn btn-primary'   

data/app/views/layouts/fly_admin/_error_flash_message.html.haml

@@ -0,0 +1,7 @@
+.alert.alert-danger.fade.in
+  %button.close{"data-dismiss" => "alert"}
+    ×
+  %i.fa-fw.fa.fa-info
+  %strong К сведению: 
+  = msg
+

data/app/views/layouts/fly_admin/_flash_messages.html.haml

@@ -13,13 +13,12 @@
           ×
         %i.fa-fw.fa.fa-info
         %strong К сведению: 
-        = msg
     - when "error"
-      = render 'layouts/error_flash_message', msg: msg
+      = render 'layouts/fly_admin/error_flash_message', msg: msg
     - else
       .alert.alert-info.fade.in
         %button.close{"data-dismiss" => "alert"}
           ×
         %i.fa-fw.fa.fa-info
         %strong К сведению: 
-        = msg
+        = msg

data/lib/fly_admin/connection_api.rb

@@ -20,12 +20,8 @@ module FlyAdmin
     def self.get_customer_params(params, request)
      if ENV["RAILS_ENV"] == 'test' || ENV['TEST'].present? || Rails.env.eql?('test')
         { key: 'fun_key', alias: 'imbs_domain.com', action_type: 'wap', 'status' => 'ok', country: 'az'}
-      else
+     else
         url = SiteConfig['wap_click_addr'] + '/api/handle_customer'
-        # if Rails.env.eql? 'development'
-        #   url = 'http://0.0.0.0:3000' + '/api/handle_customer'
-        #   request.env['REMOTE_ADDR'] = '83.149.34.187'
-        # end
         request_params = self.make_customer_request_params(request, params)
         if ENV['TEST']
           request_params[:remote_addr] = '83.149.9.19'
@@ -37,12 +33,11 @@ module FlyAdmin
           API_LOG.info "RESPONSE FROM IMBS: #{response.inspect}"
           out_hash = JSON.parse(response)
           out_hash.with_indifferent_access
-        rescue Exception => e
+        rescue
           API_LOG.error "response: #{response.inspect}"
           {status: 'error'}
         end
-      end
-      # end
+     end
     end
 
     def self.make_customer_request_params(request, params)

data/lib/fly_admin/page_cache.rb

@@ -34,8 +34,11 @@ module FlyAdmin
       text
     end
 
+    # After saving footer, clear cache and check if from imbs source(now - from db) 
     def clear_element(elem)
       @rails_cache.delete_matched(elem)
+      new_text = check_footer(elem)
+      write_with_date(elem, new_text)
     end
 
     def write_with_date(elem, text)

data/lib/fly_admin/version.rb

@@ -1,3 +1,3 @@
 module FlyAdmin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/fly_admin.rb

@@ -1,7 +1,7 @@
 require "fly_admin/engine"
 require "fly_admin/page_cache"
 require "fly_admin/connection_api"
-require "awesome_print"
+# require "awesome_print"
 module FlyAdmin
   # See fly_admin_initializer.rb for more description
   mattr_accessor :api_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ruslan Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -955,6 +955,7 @@ files:
 - app/views/fly_admin/videos/index.html.haml
 - app/views/fly_admin/videos/new.html.erb
 - app/views/fly_admin/videos/show.html.erb
+- app/views/layouts/fly_admin/_error_flash_message.html.haml
 - app/views/layouts/fly_admin/_flash_messages.html.haml
 - app/views/layouts/fly_admin/_header.html.haml
 - app/views/layouts/fly_admin/_left_panel.html.haml
@@ -1008,9 +1009,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -1088,9 +1087,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

data/test/dummy/log/development.log

@@ -1,10 +0,0 @@
-   (1.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.1ms)  select sqlite_version(*)
-   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateFlyAdminFooters (20150417075759)
-   (0.1ms)  begin transaction
-   (20.3ms)  CREATE TABLE "fly_admin_footers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "content" text, "unsubscription" text, "offer" text, "paysite_id" integer, "country_id" integer, "terms" text DEFAULT '', "created_at" datetime, "updated_at" datetime) 
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150417075759"]]
-   (2.2ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"