KinopoiskAPI 0.8.2 → 0.9.0

data/lib/KinopoiskAPI/film.rb

@@ -3,255 +3,100 @@ module KinopoiskAPI
     attr_accessor :id, :url
 
     def initialize(id)
-      @id = id
-      @url = "#{DOMAINS[:api]}/#{METHODS[:get_film][:method]}?#{METHODS[:get_film][:id]}=#{id}"
+      @id   = id.to_i
+      @url  = "#{DOMAINS[:api]}/#{METHODS[:get_film][:method]}?#{METHODS[:get_film][:id]}=#{id}"
+      @url2 = "#{DOMAINS[:api]}/#{METHODS[:get_staff][:method]}?#{METHODS[:get_staff][:id]}=#{id}"
       @json = json
-    end
 
-    def all
-      {
-          id: @id,
-          url: url,
-          title: title,
-          slogan: slogan,
-          description: description,
-          poster: poster,
-          year: year,
-          kinopoisk: kinopoisk,
-          imdb: imdb,
-          number_of_reviews: number_of_reviews,
-          duration: duration,
-          countries: countries,
-          genres: genres,
-          video: video,
-          is_sequel_or_prequel: is_sequel_or_prequel,
-          is_similar_films: is_similar_films,
-          is_imax: is_imax,
-          is_3d: is_3d,
-          rating_mpaa: rating_mpaa,
-          minimal_age: minimal_age,
-          names: all_names
-      }
+      unless status
+        raise APIerror.new(@json[:message], @json[:data])
+      end
+
     end
 
-    def url
-      @json['webURL'].present? ? @json['webURL'] : nil
+    def view
+      film_hash(@json).merge(rating).merge(rent).merge(budget)
     end
 
-    def title
+    def rating
       {
-          ru: @json['nameRU'].present? ? @json['nameRU'] : nil,
-          en: @json['nameEN'].present? ? @json['nameEN'] : nil
+        :rating_good_review             => int_data('ratingData', 'ratingGoodReview', nil),
+        :rating_good_review_vote_count  => int_data('ratingData', 'ratingGoodReviewVoteCount'),
+        :rating                         => int_data('ratingData', 'rating', nil, Float),
+        :rating_vote_count              => int_data('ratingData', 'ratingVoteCount'),
+        :rating_await                   => int_data('ratingData', 'ratingAwait', nil),
+        :rating_await_count             => int_data('ratingData', 'ratingAwaitCount'),
+        :rating_imdb                    => int_data('ratingData', 'ratingIMDb', nil, Float),
+        :rating_imdb_vote_count         => int_data('ratingData', 'ratingIMDbVoteCount'),
+        :rating_film_critics            => int_data('ratingData', 'ratingFilmCritics', nil),
+        :rating_film_critics_vote_count => int_data('ratingData', 'ratingFilmCriticsVoteCount'),
+        :rating_rf_critics              => int_data('ratingData', 'ratingRFCritics', nil),
+        :rating_fr_critics_vote_count   => int_data('ratingData', 'ratingRFCriticsVoteCount')
       }
     end
 
-    def slogan
-      @json['slogan'].present? ? @json['slogan'] : nil
-    end
-
-    def description
-      @json['description'].present? ? @json['description'] : nil
-    end
-
-    def poster
-      "#{DOMAINS[:kinopoisk][:poster][:film]}_#{@id}.jpg"
-    end
-
-    def year
-      @json['year'].present? ? @json['year'] : nil
-    end
-
-    def kinopoisk
-      if @json.present?
-        local_data = @json['ratingData']
-
-        if !local_data.nil?
-          rating = local_data['rating'].nil? ? nil : local_data['rating']
-          quantity = local_data['ratingVoteCount'].nil? ? nil : local_data['ratingVoteCount'].to_s.delete(' ').to_i
-
-          good_reviews_in_percentage = local_data['ratingGoodReview'].nil? ? nil : local_data['ratingGoodReview']
-          number_of_good_reviews = local_data['ratingGoodReviewVoteCount'].nil? ? nil : local_data['ratingGoodReviewVoteCount'].to_s.delete(' ').to_i
-
-          waiting_in_percentage = local_data['ratingAwait'].nil? ? nil : local_data['ratingAwait']
-          number_of_waiting = local_data['ratingAwaitCount'].nil? ? nil : local_data['ratingAwaitCount'].to_s.delete(' ').to_i
-
-          film_critics_in_percentage = local_data['ratingFilmCritics'].nil? ? nil : local_data['ratingFilmCritics']
-          film_critics = local_data['ratingFilmCriticsVoteCount'].nil? ? nil : local_data['ratingFilmCriticsVoteCount'].to_s.delete(' ').to_i
-
-          rf_critics_in_percentage = local_data['ratingRFCritics'].nil? ? nil : local_data['ratingRFCritics']
-          rf_critics = local_data['ratingRFCriticsVoteCount'].nil? ? nil : local_data['ratingRFCriticsVoteCount'].to_s.delete(' ').to_i
-        else
-          rating = 0.0
-          quantity = 0
-
-          good_reviews_in_percentage = '0%'
-          number_of_good_reviews = 0
-
-          waiting_in_percentage = '0%'
-          number_of_waiting = 0
-
-          film_critics_in_percentage = '0%'
-          film_critics = 0
-
-          rf_critics_in_percentage = '0%'
-          rf_critics = 0
-        end
-
-        {
-            rating: rating,
-            quantity: quantity,
-
-            good_reviews_in_percentage: good_reviews_in_percentage,
-            number_of_good_reviews: number_of_good_reviews,
-
-            waiting_in_percentage: waiting_in_percentage,
-            number_of_waiting: number_of_waiting,
-
-            film_critics_in_percentage: film_critics_in_percentage,
-            film_critics: film_critics,
-
-            rf_critics_in_percentage: rf_critics_in_percentage,
-            rf_critics: rf_critics
-        }
-      else
-        nil
-      end
-    end
-
-    def imdb
-      if @json.present?
-        local_data = @json['ratingData']
-
-        if !local_data.nil?
-          rating = local_data['ratingIMDb'].nil? ? 0.0 : local_data['ratingIMDb']
-          quantity = local_data['ratingIMDbVoteCount'].nil? ? 0 : local_data['ratingIMDbVoteCount'].to_s.delete(' ').to_i
-        else
-          rating = 0.0
-          quantity = 0
-        end
-
-        {
-            id: @json['imdbID'],
-            rating: rating,
-            quantity: quantity
-        }
-      else
-        nil
-      end
-    end
-
-    def number_of_reviews
-      @json['reviewsCount'].present? ? @json['year'] : nil
-    end
-
-    def duration
-      @json['filmLength'].present? ? @json['filmLength'] : 0
+    def rent
+      {
+        :distributors           => str_data('rentData',  'Distributors'),
+        :premiere_world_country => str_data('rentData',  'premiereWorldCountry'),
+        :distributor_release    => str_data('rentData',  'distributorRelease'),
+        :premiere_ru            => time_data('rentData', 'premiereRU'),
+        :premiere_world         => time_data('rentData', 'premiereWorld'),
+        :premiere_dvd           => time_data('rentData', 'premiereDVD'),
+        :premiere_blu_ray       => time_data('rentData', 'premiereBluRay')
+      }
     end
 
-    def countries
-      if @json.present?
-        @json['country'].present? ? @json['country'].split(',').map { |country| country.strip } : nil
-      else
-        nil
-      end
+    def budget
+      {
+        :gross_ru    => int_data('budgetData', 'grossRU',    nil),
+        :gross_usa   => int_data('budgetData', 'grossUSA',   nil),
+        :gross_world => int_data('budgetData', 'grossWorld', nil),
+        :budget      => int_data('budgetData', 'budget',     nil)
+      }
     end
 
-    def genres
-      if @json.present?
-        @json['genre'].present? ?  @json['genre'].split(',').map { |genre| genre.strip } : nil
-      else
-        nil
+    def peoples
+      unless @json['creators'].nil?
+        @json['creators'].map { |items|
+          items.map do |item|
+            people_hash_old(item)
+          end
+        }.flatten
       end
     end
 
-    def video
-      @json['videoURL'].present? ? @json['videoURL'] : nil
-    end
-
-    def is_sequel_or_prequel
-      @json['isHasSequelsAndPrequelsFilms'].present? ? @json['isHasSequelsAndPrequelsFilms'] : false
-    end
-
-    def is_similar_films
-      @json['isHasSimilarFilms'].present? ? @json['isHasSimilarFilms'] : false
-    end
-
-    def is_imax
-      @json['isIMAX'].present? ? @json['isIMAX'] : false
-    end
-
-    def is_3d
-      @json['is3D'].present? ? @json['is3D'] : false
-    end
-
-    def rating_mpaa
-      @json['ratingMPAA'].present? ? @json['ratingMPAA'] : nil
-    end
-
-    def minimal_age
-      @json['ratingAgeLimits'].present? ? @json['ratingAgeLimits'] : 0
-    end
-
-    def all_names
-      correctly = {}
-      unless creators.nil?
-        creators.each do |items|
-          new_items = []
-          items.each do |item|
-            poster = item['posterURL'].present? ? "#{DOMAINS[:kinopoisk][:poster][:name]}_#{item['id']}.jpg" : nil
-            new_item = {
-                id: item['id'],
-                url: "#{DOMAINS[:kinopoisk][:main]}/name/#{item['id']}",
-                full_name: {
-                    ru: item['nameRU'].present? ? item['nameRU'] : nil,
-                    en: item['nameEN'].present? ? item['nameEN'] : nil
-                },
-                description: item['description'].present? ? item['description'] : nil,
-                poster: poster,
-                profession: item['professionText'].present? ? item['professionText'] : nil
-            }
-            new_items.push(new_item)
+    def peoples_full
+      json2
+      unless @json2['creators'].nil?
+        @json2['creators'].map { |items|
+          items.map do |item|
+            people_hash_old(item)
           end
-          items.each do |item|
-            correctly[item['professionKey']] = new_items
-          end
-        end
+        }.flatten
       end
-      correctly
-    end
-
-    def name_profession(name)
-      names[name].nil? ? nil : names[name]
     end
 
-    def premiere
-      local_data = @json['rentData']
-
-      if !local_data.nil?
-        ru = local_data['premiereRU'].nil? ? nil : Date.parse(local_data['premiereRU'])
-        world = local_data['premiereWorld'].nil? ? nil : Date.parse(local_data['premiereWorld'])
-        world_country = local_data['premiereWorldCountry'].nil? ? nil : local_data['premiereWorldCountry']
-      else
-        ru = nil
-        world = nil
-        world_country = nil
-      end
+    ##########################
+    ##########################
+    ##########################
 
-      {
-          ru: ru,
-          world: world,
-          world_country: world_country
-      }
-    end
 
     private
 
-      def creators
-        if @json.present?
-          @json['creators'].present? ? @json['creators'] : nil
-        else
-          nil
-        end
+      def people_hash_old(item)
+        Hash[
+          [
+            [:id,              item['id'].to_i       ],
+            [:kp_type,         item['type']          ],
+            [:poster_url,      item['posterURL'].present? ? "#{DOMAINS[:kinopoisk][:poster][:name]}_#{item['id']}.jpg" : nil],
+            [:name_ru,         item['nameRU']        ],
+            [:name_en,         item['nameEN']        ],
+            [:description,     item['description']   ],
+            [:profession_text, item['professionText']],
+            [:profession_key,  item['professionKey'] ]
+          ]
+        ]
       end
 
   end

data/lib/KinopoiskAPI/film_search.rb

@@ -0,0 +1,53 @@
+module KinopoiskAPI
+  class FilmSearch < Agent
+    attr_accessor :keyword, :url
+
+    def initialize(keyword)
+      @keyword = URI.encode(keyword)
+      @page = 1
+      gen_url
+      @json = json
+      @page_count = @json['pagesCount']
+    end
+
+    def films_count
+      @json['searchFilmsCountResult']
+    end
+
+    def page_count
+      @page_count
+    end
+
+    def current_page
+      @current_page
+    end
+
+    def view
+      @json['searchFilms'].map do |film|
+        film_hash(film)
+      end
+    end
+
+    def next_page
+      if @page < @page_count
+        @page += 1
+        gen_url
+        @json = json
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+      def gen_url
+        @url = [
+          "#{DOMAINS[:api]}/#{METHODS[:search_film][:method]}",
+          "?#{METHODS[:search_film][:keyword]}=#{@keyword}",
+          "&#{METHODS[:search_film][:page]}=#{@page}"
+        ].join('')
+      end
+
+  end
+end

data/lib/KinopoiskAPI/global_search.rb

@@ -4,102 +4,34 @@ module KinopoiskAPI
 
     def initialize(keyword)
       @keyword = URI.encode(keyword)
-      @url = "#{DOMAINS[:api]}/#{METHODS[:search_global][:method]}?#{METHODS[:search_global][:keyword]}=#{@keyword}"
-      @json = json
+      @url     = "#{DOMAINS[:api]}/#{METHODS[:search_global][:method]}?#{METHODS[:search_global][:keyword]}=#{@keyword}"
+      @json    = json
     end
 
-    def all
-      {
-          keyword: keyword,
-          quantity: {
-              films: number_of_films,
-              names: number_of_names
-          },
-          exactly: exactly,
-          maybe: maybe,
-          names: names
-      }
-    end
-
-    def keyword
-      @json['keyword']
-    end
-
-    def number_of_films
+    def films_count
       @json['searchFilmsCountResult']
     end
 
-    def number_of_names
+    def names_count
       @json['searchPeoplesCountResult']
     end
 
-    def exactly
-      {
-          id: json_exactly['id'],
-          title: {
-              ru: json_exactly['nameRU'],
-              en: json_exactly['nameEN']
-          },
-          info: json_exactly['description'],
-          duration: json_exactly['filmLength'],
-          year: json_exactly['year'],
-          countries: json_exactly['country'].split(',').map { |country| country.strip },
-          genres: json_exactly['genre'].split(',').map { |genre| genre.strip },
-          rating: json_exactly['rating'],
-          poster: "#{DOMAINS[:kinopoisk][:poster][:film]}_#{json_exactly['id']}.jpg"
-      }
+    def youmean
+      film_hash(@json['youmean'])
     end
 
-    def maybe
-      correctly = []
-      json_films.each do |film|
-        new_item = {
-            id: json_exactly['id'],
-            title: {
-                ru: json_exactly['nameRU'],
-                en: json_exactly['nameEN']
-            },
-            info: film['description'],
-            duration: film['filmLength'],
-            year: film['year'],
-            countries: film['country'].split(',').map { |country| country.strip },
-            genres: film['genre'].split(',').map { |genre| genre.strip },
-            poster: "#{DOMAINS[:kinopoisk][:poster][:film]}_#{film['id']}.jpg"
-        }
-        correctly.push(new_item)
+    def films
+      @json['searchFilms'].map do |film|
+        film_hash(film)
       end
-      correctly
     end
 
-    def names
-      correctly = []
-      json_names.each do |name|
-        new_item = {
-            full_name: {
-                ru: name['nameRU'],
-                en: name['nameEN']
-            },
-            info: name['description'],
-            poster: "#{DOMAINS[:kinopoisk][:poster][:name]}_#{name['id']}.jpg"
-        }
-        correctly.push(new_item)
+    def peoples
+      json['searchPeople'].map do |name|
+        people_hash(name)
       end
-      correctly
-    end
-
-    private
-
-    def json_exactly
-      @json['youmean']
     end
 
-    def json_films
-      @json['searchFilms']
-    end
-
-    def json_names
-      @json['searchPeople']
-    end
 
   end
 end